Added javadoc and deleted comments
Merge origin/cleanup