Tidied up javadoc