Performance improvements.  Map is slow.
Performance improvements.  Map is slow.

NeilFraser/CodeCity,NeilFraser/CodeCity,google/CodeCity,google/CodeCity,google/CodeCity,NeilFraser/CodeCity,NeilFraser/CodeCity,google/CodeCity