Small cleanup of hte Map class