Add javadoc
Cleaning