Increase map zoom level

and clean up our MapBox code.