Unify city naming into one method with pattern matching.
Merge pull request #2 from Jazztoken/master

Unify city naming into one method with pattern matching.