javadoc + refactoring