City zoning ordinance overhaul is closer to completion