Refactor Map