Revised Style, split up city variables