javadoc and Checkstyle fixes