javadoc, comment cleanup