Refactorings

[pompeiifreckles]

Purpose

Description

Checklist

• [x] New code follows the Google Java Style Guide\ This is automatically checked by mvn verify, but can also be checked on its own using mvn spotless:check.\ Style violations can be fixed using mvn spotless:apply; this can be done in a separate commit to verify that it did not cause undesired changes.
• [x] If necessary, new public API validates arguments, for example rejects null
• [x] New public API has Javadoc
  • [x] Javadoc uses @since $next-version$
    ($next-version$ is a special placeholder which is automatically replaced during release)
• [x] If necessary, new unit tests have been added
  • [x] Assertions in unit tests use Truth, see existing tests
  • [x] No JUnit 3 features are used (such as extending class TestCase)
  • [x] If this pull request fixes a bug, a new test was added for a situation which failed previously and is now fixed
• [x] mvn clean verify javadoc:jar passes without errors

[google-cla[bot]]

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

[eamonnmcmanus]

Could you give some background on what you are trying to achieve here? We are definitely not going to accept a huge PR like this without explanation, even if it were correct.