Calm down, map

Addresses map craziness reported in #453 

There was a bit of tidy-up in here. Whitespace, semicolons and a little bit of syntax.