Refactor Map: cleanup