refactoring, updates of javadoc comments