started cleaning up the map fragment