clean up and playing with d3