CheckStyles/code cleanup and JavaDoc

Last of the nearly-purely-cleanup PRs for a bit, I promise.  I hit all of this while wrapping my head around how to approach the test suite issue.