cleaning up and java docing