Whitespace + tidy-up
Tidy-up
Semicolon
Fix map craziness
Merge pull request #479 from aodn/Issue-453

Calm down, map