Fix center block city name issue. Clean up switch case block
Use modulus and a constant multiplier instead