java-doc & clean-up
java-doc & clean-up