code cleanup
Merge branch 'master' of git@github.com:nullbox/Data-and-Information-Visualization-Project.git