removed primitive obsession for city and price