Working on javadoc