cleanup
comments, javadoc