refactoring
aggregate javadoc