javadoc refactoring
fix conflicts
refactoring, javadoc