Cleaning up the javadoc