Cleanup
Added javadoc