cleanup
javadoc, package-info and cleanup