209 World Cities - Refactoring