Updates to new d3.js style