Tidy up javadoc some more