diff --git a/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterProtocol.swift b/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterProtocol.swift
index 0f6c843..2cf156b 100644
--- a/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterProtocol.swift	
+++ b/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterProtocol.swift	
@@ -35,7 +35,7 @@ public extension ClientParameterProtocol {
         if isFlatMap {
             completionHandler(parameter)
         } else {
-            completionHandler([Self.name :parameter])
+            completionHandler([Self.name: parameter])
         }
     }
 }
diff --git a/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterRegistry.swift b/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterRegistry.swift
index 996dfbc..bfbbfd2 100644
--- a/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterRegistry.swift	
+++ b/MVMCore/MVMCore/Models/ActionType/Client Parameters/ClientParameterRegistry.swift	
@@ -76,12 +76,8 @@ import Foundation
             var mergedParametersList: [String: AnyHashable] {
                 var parametersList: [String: AnyHashable] = [:]
                 for (index, item) in returnedList.enumerated() {
-                    if let item = item {
-                        parametersList = parametersList.merging(item) { (_, new) in new }
-                    } else {
-                        let defaultValue = parameterHandlerList[index].valueOnTimeout()
-                        parametersList = parametersList.merging(defaultValue) { (_, new) in new }
-                    }
+                    let parameter = item ?? parameterHandlerList[index].valueOnTimeout()
+                    parametersList = parametersList.merging(parameter) { (_, new) in new }
                 }
                 return parametersList
             }