started cleaning up the map fragment
Merge pull request #2 from dvicini/master

started cleaning up the map fragment