Done cleaning up the source until I figure out d3.js