Removed a couple of printouts, fixed a couple of comments, removed Test class