clean up and fixed javadoc