CODE: Refactor Map.