diff --git a/ipmi/test_ipmi_general.robot b/ipmi/test_ipmi_general.robot
index 73a0b99..faab290 100644
--- a/ipmi/test_ipmi_general.robot
+++ b/ipmi/test_ipmi_general.robot
@@ -105,7 +105,10 @@
     ${channel_volatile_data_config}=  Get Channel Access Config  /run/ipmi/channel_access_volatile.json
     ${channel_nv_data_config}=  Get Channel Access Config  /var/lib/ipmi/channel_access_nv.json
 
-    Rprint Vars  channel_info_ipmi  active_channel_config  channel_volatile_data_config  channel_nv_data_config
+    Rprint Vars  channel_info_ipmi
+    Rprint Vars  active_channel_config
+    Rprint Vars  channel_volatile_data_config
+    Rprint Vars  channel_nv_data_config
 
     Valid Value  medium_type_ipmi_conf_map['${channel_info_ipmi['channel_0x${CHANNEL_NUMBER}_info']['channel_medium_type']}']
     ...  ['${active_channel_config['${CHANNEL_NUMBER}']['channel_info']['medium_type']}']
@@ -248,7 +251,8 @@
     [Arguments]  ${privilege_level}  ${expected_level}
     # Description of argument(s):
     # privilege_level    Requested Privilege Level.
-    # expected_level     New Privilege Level (or present level if ‘return present privilege level’ was selected).
+    # expected_level     New Privilege Level (or present level if ‘return present privilege level’
+    #                    was selected).
 
     ${resp}=  Run External IPMI Raw Command
     ...  0x06 0x3b ${privilege_level}
diff --git a/lib/bmc_network_utils.robot b/lib/bmc_network_utils.robot
index 7a42a22..efe6998 100644
--- a/lib/bmc_network_utils.robot
+++ b/lib/bmc_network_utils.robot
@@ -452,7 +452,7 @@
 
     # Description of argument(s):
     # network_active_channel   Ethernet channel number (eg. 1 or 2)
-    
+
     ${active_channel_config}=  Get Active Channel Config
     ${resp}=  Redfish.Get
     ...  ${REDFISH_NW_ETH_IFACE}${active_channel_config['${network_active_channel}']['name']}
diff --git a/lib/protocol_setting_utils.robot b/lib/protocol_setting_utils.robot
index ab5e3bf..46617fb 100644
--- a/lib/protocol_setting_utils.robot
+++ b/lib/protocol_setting_utils.robot
@@ -130,5 +130,3 @@
     ${resp}=  Redfish.Get  ${REDFISH_NW_PROTOCOL_URI}
     Should Be Equal As Strings  ${resp.dict['IPMI']['ProtocolEnabled']}  ${state}
     ...  msg=Protocol states are not matching.
-
-
diff --git a/lib/redfish_code_update_utils.robot b/lib/redfish_code_update_utils.robot
index 3feeed4..dd094d0 100644
--- a/lib/redfish_code_update_utils.robot
+++ b/lib/redfish_code_update_utils.robot
@@ -19,7 +19,7 @@
     ${resp}=  Redfish.Get  /redfish/v1/UpdateService/FirmwareInventory/${image_id}
     ...  valid_status_codes=[${HTTP_OK}, ${HTTP_INTERNAL_SERVER_ERROR}]
     ${image_info}  Set Variable  ${resp.dict}
- 
+
     ${sw_functional}=  Run Keyword If
     ...   '${image_info["Description"]}' == 'BMC image' or '${image_info["Description"]}' == 'BMC update'
     ...    Redfish.Get Attribute  /redfish/v1/Managers/bmc  FirmwareVersion
diff --git a/openpower/service_account/test_service_user.robot b/openpower/service_account/test_service_user.robot
index a4929b3..78c5a5a 100644
--- a/openpower/service_account/test_service_user.robot
+++ b/openpower/service_account/test_service_user.robot
@@ -1,7 +1,7 @@
 *** Settings ***
 Documentation    This suite is to test service user functionality via Redfish.
 
-Resource         ../../lib/connection_client.robot 
+Resource         ../../lib/connection_client.robot
 Resource         ../../lib/openbmc_ffdc.robot
 Resource         ../../lib/bmc_redfish_utils.robot
 
diff --git a/redfish/managers/test_bmc_protocol_settings.robot b/redfish/managers/test_bmc_protocol_settings.robot
index 251c05b..2ddbae2 100644
--- a/redfish/managers/test_bmc_protocol_settings.robot
+++ b/redfish/managers/test_bmc_protocol_settings.robot
@@ -160,7 +160,8 @@
 
 
 Enable IPMI Protocol And Check Persistency On BMC Reboot
-    [Documentation]  Set the IPMI protocol attribute to True, reset BMC, and verify that the setting persists.
+    [Documentation]  Set the IPMI protocol attribute to True, reset BMC, and verify
+    ...              that the setting persists.
     [Tags]  Enable_IPMI_Protocol_And_Check_Persistency_On_BMC_Reboot
 
     Enable IPMI Protocol  ${True}
@@ -175,7 +176,8 @@
 
 
 Disable IPMI Protocol And Check Persistency On BMC Reboot
-    [Documentation]  Set the IPMI protocol attribute to False, reset BMC, and verify that the setting persists.
+    [Documentation]  Set the IPMI protocol attribute to False, reset BMC, and verify
+    ...              that the setting persists.
     [Tags]  Disable_IPMI_Protocol_And_Check_Persistency_On_BMC_Reboot
 
     # Disable IPMI interface.