Cleanup, javadocs ++