Refactor MapView