refactoring and javadoc updates