Javadoc and refactoring