minor refactoring: javadoc fixes, removing unneeded print outs