diff --git a/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m b/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m
index 125e1d5..d069404 100644
--- a/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m
+++ b/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m
@@ -128,7 +128,11 @@ NSString * const KeyActionTypeOpen = @"openPage";
         }];
     };
 
-    // BAU dictionary comparsion breaks if client paramters sets the dictionarr. For now we will set client paramters only when its sent in the action map
+    /*
+     BAU dictionary comparsion breaks if client parameters sets the dictionary.
+     For now we will set client parameters only when its sent in the action map.
+     We can move the code to Objective-C if required.
+     */
     if ([actionInformation dict:KeyClientParameters]) {
         [self setClientParameterWith:actionInformation completionHandler:performAction];
     } else {
@@ -298,7 +302,11 @@ NSString * const KeyActionTypeOpen = @"openPage";
         [weakSelf prepareLinkAwayWithURL:otherURL appURL:appURL actionInformation:actionMap additionalData:additionalData delegateObject:delegateObject];
     };
 
-    // BAU dictionary comparsion breaks if client paramters sets the dictionarr. For now we will set client paramters only when its sent in the action map
+    /*
+     BAU dictionary comparsion breaks if client parameters sets the dictionary.
+     For now we will set client parameters only when its sent in the action map.
+     We can move the code to Objective-C if required.
+     */
     if ([actionInformation dict:KeyClientParameters]) {
         [self setClientParameterWith:actionInformation completionHandler:performAction];
     } else {
@@ -453,7 +461,11 @@ NSString * const KeyActionTypeOpen = @"openPage";
         }];
     };
 
-    // BAU dictionary comparsion breaks if client paramters sets the dictionarr. For now we will set client paramters only when its sent in the action map
+    /*
+     BAU dictionary comparsion breaks if client parameters sets the dictionary.
+     For now we will set client parameters only when its sent in the action map.
+     We can move the code to Objective-C if required.
+     */
     if ([actionInformation dict:KeyClientParameters]) {
         [self setClientParameterWith:actionInformation completionHandler:performAction];
     } else {
@@ -577,7 +589,11 @@ NSString * const KeyActionTypeOpen = @"openPage";
         [weakSelf prepareLinkAwayWithURL:otherURL appURL:appURL actionInformation:actionMap additionalData:additionalData delegate:delegate];
     };
 
-    // BAU dictionary comparsion breaks if client paramters sets the dictionarr. For now we will set client paramters only when its sent in the action map
+    /*
+     BAU dictionary comparsion breaks if client parameters sets the dictionary.
+     For now we will set client parameters only when its sent in the action map.
+     We can move the code to Objective-C if required.
+     */
     if ([actionInformation dict:KeyClientParameters]) {
         [self setClientParameterWith:actionInformation completionHandler:performAction];
     } else {