Refactor to closure

Refactored citizenMap to a closure