cleaning up and added d3