Use D3.Map instead of Javascript Object

Renamed a few things as well.