refactoring + update of javadoc