cleanup, javadoc