Refactor MapFragment