Improved comma output after the city