Added city formatting