reworking d3 choropleth