Cleanup, javadocs.