Cleanup for the map and should take in correct vals