java-doc & clean-up