Preliminary cleanup of the Map class