javadoc and clean up complete