further clean up work on the map fragment