javadoc comments, checkstyle, small change