Tidy map
Merge pull request #816 from adambutler/tidy-map

Tidy map