             logger.logParamSetWithSuccess(USER_ID, value: userID as! String);
             params.removeValue(forKey: USER_ID);
         }
-        else if (params.count > 0) {
+        if (params.count > 0) {
             for (key, value) in params {
                 FIRAnalytics.setUserPropertyString(value as? String, forName:key as! String);
-                logger.logParamSetWithSuccess((key as? String)!, value: (value as? String)!);
+                logger.logParamSetWithSuccess(key as! String, value: value as! String);
             }
         }
         else {
-            logger.logMissingParam(USER_ID, methodName: "Firebase_identify");
+            logger.logMissingParam(USER_ID, methodName: FIR_IDENTIFY);
         }
     }
 

    /// - Parameters:
    ///   - enableCollection: a boolean true/false for collection enabled/disabled
    func initialize(_ parameters: [AnyHashable: Any]) {
        if let enabled = parameters[enableCollection]{
            FirebaseAnalyticsConf.setAnalyticsCollectionEnabled(enabled as! Bool);
            logger.logParamSetWithSuccess(enableCollection, value: enabled as! Bool);
        }
        else{
            logger.logMissingParam(enableCollection, methodName: "Firebase_initialize");
        }
    }


        self.FirebaseAnalyticsConf = FIRAnalyticsConfiguration();
        FIRApp.configure();

        cargo.registerTagHandler(self, key: FIR_INIT);
        cargo.registerTagHandler(self, key: FIR_IDENTIFY);
        cargo.registerTagHandler(self, key: FIR_TAG_SCREEN);
        cargo.registerTagHandler(self, key: FIR_TAG_EVENT);
    }

    /// Callback from GTM container designed to execute a specific method
