Adding Javadoc and cleaning classes