javadoc and refactoring