More cleanup/simplification in Map
More cleanup/simplification in Map

howardjones/network-weathermap,howardjones/network-weathermap,howardjones/network-weathermap,howardjones/network-weathermap,howardjones/network-weathermap,howardjones/network-weathermap