refactor Map