refactoring, javadoc