tidy up, javadocs
tidy up, javadocs