Cleaning up classes: removing print outs/adding javadocs