diff --git a/openpower/ext_interfaces/test_savearea_management.robot b/openpower/ext_interfaces/test_savearea_management.robot
index 0ae4d6e..111d965 100644
--- a/openpower/ext_interfaces/test_savearea_management.robot
+++ b/openpower/ext_interfaces/test_savearea_management.robot
@@ -881,7 +881,8 @@
     FOR  ${file_name}  IN  @{file_list}
       @{Partition_file_list} =  Split String  ${file_name}  ,
       ${num_records}=  Get Length  ${Partition_file_list}
-      Upload Partition File To BMC  file_name=${Partition_file_list}  status_code=${HTTP_OK}  expected_message=${FILE_UPLOAD_MESSAGE}  path=${PARTITION_FILE_PATH}
+      Upload Partition File To BMC  file_name=${Partition_file_list}
+      ...  status_code=${HTTP_OK}  expected_message=${FILE_UPLOAD_MESSAGE}  path=${PARTITION_FILE_PATH}
       Verify Partition File On BMC  ${Partition_file_list}  Partition_status=1
       Delete BMC Partition File  ${Partition_file_list}  ${HTTP_OK}  ${FILE_DELETED_MESSAGE}
     END
diff --git a/openpower/ext_interfaces/test_vmi.robot b/openpower/ext_interfaces/test_vmi.robot
index 0bc0a17..b523796 100644
--- a/openpower/ext_interfaces/test_vmi.robot
+++ b/openpower/ext_interfaces/test_vmi.robot
@@ -180,8 +180,8 @@
     FOR  ${i}  IN RANGE  ${2}
         Redfish Power Off
         Redfish Power On
-        Verify VMI Network Interface Details  ${vmi_ip_config["IPv4_Address"]}  DHCP  ${vmi_ip_config["IPv4_Gateway"]}
-    ...  ${vmi_ip_config["IPv4_SubnetMask"]}
+        Verify VMI Network Interface Details  ${vmi_ip_config["IPv4_Address"]}
+        ...  DHCP  ${vmi_ip_config["IPv4_Gateway"]}  ${vmi_ip_config["IPv4_SubnetMask"]}
     END
 
 
@@ -238,8 +238,8 @@
     ${curr_origin}=  Get Immediate Child Parameter From VMI Network Interface  DHCPEnabled
     Run Keyword If  ${curr_origin} == ${False}  Set VMI IPv4 Origin  ${True}  ${HTTP_ACCEPTED}
     ${vmi_ip_config}=  Get VMI Network Interface Details
-    Verify VMI Network Interface Details  ${vmi_ip_config["IPv4_Address"]}  DHCP  ${vmi_ip_config["IPv4_Gateway"]}
-    ...  ${vmi_ip_config["IPv4_SubnetMask"]}
+    Verify VMI Network Interface Details  ${vmi_ip_config["IPv4_Address"]}
+    ...  DHCP  ${vmi_ip_config["IPv4_Gateway"]}  ${vmi_ip_config["IPv4_SubnetMask"]}
 
 Verify User Cannot Delete VMI DHCP IP Address
     [Documentation]  Verify user cannot delete VMI DHCP IP Address
diff --git a/openpower/ext_interfaces/test_vmicert_management.robot b/openpower/ext_interfaces/test_vmicert_management.robot
index 949cd4a..de44cda 100644
--- a/openpower/ext_interfaces/test_vmicert_management.robot
+++ b/openpower/ext_interfaces/test_vmicert_management.robot
@@ -625,8 +625,10 @@
     # file_name          Name of CSR or signed CERT file.
     # is_csr_file        A True value means a CSR while a False is for signed CERT file.
 
-    ${subject}=  Run Keyword If  ${is_csr_file}  Run  openssl req -in ${file_name} -text -noout | grep Subject:
-    ...   ELSE  Run  openssl x509 -in ${file_name} -text -noout | grep Subject:
+    ${subject}=  Run Keyword If  ${is_csr_file}
+    ...     Run  openssl req -in ${file_name} -text -noout | grep Subject:
+    ...   ELSE
+    ...     Run  openssl x509 -in ${file_name} -text -noout | grep Subject:
 
     [Return]  ${subject}
 
diff --git a/redfish/account_service/test_ldap_configuration.robot b/redfish/account_service/test_ldap_configuration.robot
index 9559b82..04ff9dc 100644
--- a/redfish/account_service/test_ldap_configuration.robot
+++ b/redfish/account_service/test_ldap_configuration.robot
@@ -552,7 +552,7 @@
     ...  ${valid_status_codes}=[${HTTP_OK}]
     [Teardown]  Run Keyword If  '${group_privilege}'=='NoAccess'  Redfish.Login
                 ...  ELSE  Run Keywords  Redfish.Logout  AND  Redfish.Login
-    
+
     # Description of argument(s):
     # group_name                    The group name of user.
     # group_privilege               The group privilege ("Administrator",
@@ -724,7 +724,7 @@
 
 Restore LDAP Privilege
     [Documentation]  Restore the LDAP privilege to its original value.
-    
+
     Redfish.Login
     Return From Keyword If  '${old_ldap_privilege}' == '${EMPTY}' or '${old_ldap_privilege}' == '[]'
     # Log back in to restore the original privilege.
diff --git a/redfish/dmtf_tools/Redfish_Usecase_Checkers.robot b/redfish/dmtf_tools/Redfish_Usecase_Checkers.robot
index c34b310..798db2e 100644
--- a/redfish/dmtf_tools/Redfish_Usecase_Checkers.robot
+++ b/redfish/dmtf_tools/Redfish_Usecase_Checkers.robot
@@ -86,5 +86,3 @@
     Print Timen  Doing "DMTF Power".
 
     Run DMTF Tool  ${rsv_dir_path}  ${command_power_control}
-
-
diff --git a/redfish/extended/redfish_host_code_update.robot b/redfish/extended/redfish_host_code_update.robot
index d8832b0..006e711 100644
--- a/redfish/extended/redfish_host_code_update.robot
+++ b/redfish/extended/redfish_host_code_update.robot
@@ -43,7 +43,8 @@
 
     ${num_records}=  Get Length  ${functional_sw_inv}
 
-    Run Keyword If  ${num_records} != 0  Pass Execution If  '${functional_sw_inv['version']}' == '${image_version}'
+    Run Keyword If  ${num_records} != 0
+    ...  Pass Execution If  '${functional_sw_inv['version']}' == '${image_version}'
     ...  The existing ${image_version} firmware is already functional.
 
     ${post_code_update_actions}=  Get Post Boot Action