further clean up work on the map fragment
Merge pull request #3 from dvicini/master

further clean up work on the map fragment