reduce map for citizen
lint
lint
lint
fix tests