Use D3, more cleanup