Cleanup, javadoc, documentation

Cleanup, javadoc, documentation