Cleaning up javadoc