Tidied up javadocs