Comments and cleanup
Generate javadoc