refactor Brian's MapView code a bit