Tidied up Javadocs