Clean up and map improvements