CLEANUP, javadoc added