A bunch of PMD and javadoc cleanup