Javadoc + refactoring