In order to more comprehensively protect the health and safety of the citizens of Sonoma shall an ordinance be adopted that amends the City's existing 1992 smoking ordinance to include more protections by prohibiting smoking in public places, multi-unit residences, hotels and motels, enclosed common areas, enclosed dining areas, outdoor recreational areas and parks, outdoor public places, outdoor dining areas and within 25 feet of any area where smoking is prohibited?