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

        var closestDistance: CLLocationDistance = Double.infinity
        var closestZoneInfo: [AnyHashable: Any]?
        
        if let source = source {
            for locationInfo in source {
                
                if let latitude = locationInfo["latitude"] as? Double,
                    let longitude = locationInfo["longitude"] as? Double {
                        
                        let distance = location.distance( from: CLLocation(latitude: latitude, longitude: longitude) )
                        if  distance < closestDistance {
                            closestDistance = distance
                            closestZoneInfo = locationInfo
                        }
                }
            }
        }
        

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