refactoring Maps