Cleaned up code, and added comments

JFreeChart has been added at this point