javadoc, comment and unit test