diff --git a/ipmi/test_ipmi_network.robot b/ipmi/test_ipmi_network.robot
index dbbe581..5e601fc 100644
--- a/ipmi/test_ipmi_network.robot
+++ b/ipmi/test_ipmi_network.robot
@@ -108,11 +108,13 @@
     ${lan_config}=  Get LAN Print Dict  ${CHANNEL_NUMBER}
 
     ${ipv4_addresses}=  Redfish.Get Attribute
-    ...  /redfish/v1/Managers/bmc/EthernetInterfaces/${active_channel_config['${CHANNEL_NUMBER}']['name']}  IPv4Addresses
+    ...  /redfish/v1/Managers/bmc/EthernetInterfaces/${active_channel_config['${CHANNEL_NUMBER}']['name']}
+    ...  IPv4Addresses
 
     FOR  ${ipv4_address}  IN  @{ipv4_addresses}
-          ${ip_address_source}=  Set Variable if  '${ipv4_address['Address']}' == '${lan_config['IP Address']}'
-          ...  ${ipv4_address['AddressOrigin']} Address
+        ${ip_address_source}=
+        ...  Set Variable if  '${ipv4_address['Address']}' == '${lan_config['IP Address']}'
+        ...  ${ipv4_address['AddressOrigin']} Address
           Exit For Loop IF  "${ip_address_source}" != 'None'
     END
 
diff --git a/redfish/account_service/test_ldap_configuration.robot b/redfish/account_service/test_ldap_configuration.robot
index 0ade03a..d653b14 100644
--- a/redfish/account_service/test_ldap_configuration.robot
+++ b/redfish/account_service/test_ldap_configuration.robot
@@ -680,4 +680,3 @@
     Redfish.Post  ${REDFISH_POWER_URI}
     ...  body={'ResetType': 'ForceOff'}   valid_status_codes=[${valid_status_code}]
 
-
diff --git a/redfish/account_service/test_user_account.robot b/redfish/account_service/test_user_account.robot
index b82e776..2fc7dd8 100644
--- a/redfish/account_service/test_user_account.robot
+++ b/redfish/account_service/test_user_account.robot
@@ -223,7 +223,7 @@
     # Login with operator user.
     Redfish.Login  operator_user  TestPwd123
 
-    # Verify power on system.
+    # Verify BMC reset.
     Redfish OBMC Reboot (off)  stack_mode=normal
 
     # Attempt to change password of admin user with operator user.
diff --git a/redfish/managers/test_managers_bmc_time.robot b/redfish/managers/test_managers_bmc_time.robot
index 47671ae..34c0f93 100644
--- a/redfish/managers/test_managers_bmc_time.robot
+++ b/redfish/managers/test_managers_bmc_time.robot
@@ -108,7 +108,8 @@
     [Documentation]  Verify NTP server set.
     [Tags]  Verify_NTP_Server_Set
 
-    Redfish.Patch  ${REDFISH_NW_PROTOCOL_URI}  body={'NTP':{'NTPServers': ['${ntp_server_1}', '${ntp_server_2}']}}
+    Redfish.Patch  ${REDFISH_NW_PROTOCOL_URI}
+    ...  body={'NTP':{'NTPServers': ['${ntp_server_1}', '${ntp_server_2}']}}
     ...  valid_status_codes=[${HTTP_OK}, ${HTTP_NO_CONTENT}]
     ${network_protocol}=  Redfish.Get Properties  ${REDFISH_NW_PROTOCOL_URI}
     Should Contain  ${network_protocol["NTP"]["NTPServers"]}  ${ntp_server_1}
@@ -121,7 +122,8 @@
     [Documentation]  Verify NTP servers value not same for both primary and secondary server.
     [Tags]  Verify_NTP_Server_Value_Not_Duplicated
 
-    Redfish.Patch  ${REDFISH_NW_PROTOCOL_URI}  body={'NTP':{'NTPServers': ['${ntp_server_1}', '${ntp_server_1}']}}
+    Redfish.Patch  ${REDFISH_NW_PROTOCOL_URI}
+    ...  body={'NTP':{'NTPServers': ['${ntp_server_1}', '${ntp_server_1}']}}
     ...  valid_status_codes=[${HTTP_OK}, ${HTTP_NO_CONTENT}]
     ${network_protocol}=  Redfish.Get Properties  ${REDFISH_NW_PROTOCOL_URI}
     Should Contain X Times  ${network_protocol["NTP"]["NTPServers"]}  ${ntp_server_1}  1
@@ -132,7 +134,8 @@
     [Documentation]  Verify NTP server setting persist after BMC reboot.
     [Tags]  Verify_NTP_Server_Setting_Persist_After_BMC_Reboot
 
-    Redfish.Patch  ${REDFISH_NW_PROTOCOL_URI}  body={'NTP':{'NTPServers': ['${ntp_server_1}', '${ntp_server_2}']}}
+    Redfish.Patch  ${REDFISH_NW_PROTOCOL_URI}
+    ...  body={'NTP':{'NTPServers': ['${ntp_server_1}', '${ntp_server_2}']}}
     ...  valid_status_codes=[${HTTP_OK}, ${HTTP_NO_CONTENT}]
     Redfish OBMC Reboot (off)
     Redfish.Login