Work on javadoc