cleaning up javadoc and stuff