Refactoring plus javadoc