improved javadoc; refactoring
refactoring