Cleaned up a bit of the map code