Cleanup
Use logging in the display module
Use logging in the mapView module