Cleaned up the map generation.
Tiny bit of clean up, ready for more features to be added.