cleaned up maps