Cleaning and some javadoc