End to first refactoring in the Map class