     open class func timeZoneWithLocation(_ location:CLLocation, countryCode:String?) -> TimeZone? {
         
         //Need a countr
-        if let countryCode = countryCode,
+        guard let countryCode = countryCode,
             //Filter
-            let filteredZones = filteredTimeZonesWithCountyCode(countryCode),
+            let filteredZones = filteredTimeZones(with:countryCode),
             //Get closest zone info
-            let closestZoneInfo = closestZoneInfoWithLocation(location, source:filteredZones),
+            let closestZoneInfo = closestZoneInfo(with:location, source:filteredZones),
             //get timzone
             let timeZone = timeZoneWithDictionary(closestZoneInfo)
-        {
-            return timeZone
-        } else {
-            return timeZoneWithLocation(location)
-        }
+        else { timeZoneWithLocation(location)}
         
+        return timeZone
     }
     
     /*

    Timezone from dict
    */
    open class func timeZoneWithDictionary(_ zoneInfo: [AnyHashable: Any]?) -> TimeZone? {
        
        if let zoneName = zoneInfo?["zone"] as? String {
            return TimeZone(identifier: zoneName)
        }
        return nil
    }
    
}

    Get timezone with lat/lon and country code
    */
    open class func timeZoneWithLocation(_ location:CLLocation) -> TimeZone {
        guard let closestZoneInfo = closestZoneInfo(with:location, source: TimeZoneLocate.timeZonesDB),
              let timeZone = timeZoneWithDictionary(closestZoneInfo)
            else { return TimeZone.current } //We've found nothing. Let's use system.
        return timeZone
    }
    
    /*
