Refactored to mapbox/leaflet