Javadoc and comments 2