javadocs, refactoring