cleaned up the map code
Merge pull request #42 from WClement/master

cleaned up the map code