cleanup the map class a little