clean up city generation code