code and javadoc clean up