Improve javadoc, first shot