cleaning up comments and javadoc