Javadoc and some tidy