REFACTORING MAP MODULE