Better MapBox integration.
Code clean-up.