Refactor Map building