diff --git a/gui/gui_test/overview_menu/test_overview_menu.robot b/gui/gui_test/overview_menu/test_overview_menu.robot
index 971d2bd..cd655dc 100644
--- a/gui/gui_test/overview_menu/test_overview_menu.robot
+++ b/gui/gui_test/overview_menu/test_overview_menu.robot
@@ -46,7 +46,7 @@
 
 Verify Network Information In Overview Page
     [Documentation]  Verify values under network information section.
-    [Tags]  Verify_Network_Information_In_Overview Page
+    [Tags]  Verify_Network_Information_In_Overview_Page
 
     ${hostname}=  Get BMC Hostname
     Page Should Contain  ${hostname}
diff --git a/gui/gui_test/server_config/test_date_time_settings_sub_menu.robot b/gui/gui_test/server_config/test_date_time_settings_sub_menu.robot
index 8c5fded..eba2f9b 100644
--- a/gui/gui_test/server_config/test_date_time_settings_sub_menu.robot
+++ b/gui/gui_test/server_config/test_date_time_settings_sub_menu.robot
@@ -122,5 +122,3 @@
     Click Element  ${xpath_server_configuration}
     Click Element  ${xpath_date_time_settings_sub_menu}
     Wait Until Keyword Succeeds  30 sec  10 sec  Location Should Contain  date-time-settings
-
-
diff --git a/lib/redfish_code_update_utils.robot b/lib/redfish_code_update_utils.robot
index a383614..7520483 100644
--- a/lib/redfish_code_update_utils.robot
+++ b/lib/redfish_code_update_utils.robot
@@ -225,7 +225,8 @@
    ${sw_inv}=  Get Functional Firmware  BMC image
    ${nonfunctional_sw_inv}=  Get Non Functional Firmware  ${sw_inv}  False
 
-   ${firmware_inv_path}=  Set Variable  /redfish/v1/UpdateService/FirmwareInventory/${nonfunctional_sw_inv['image_id']}
+   ${firmware_inv_path}=
+   ...  Set Variable  /redfish/v1/UpdateService/FirmwareInventory/${nonfunctional_sw_inv['image_id']}
 
    # Below URI, change to backup image and reset the BMC.
    Redfish.Patch  /redfish/v1/Managers/bmc
diff --git a/openpower/ext_interfaces/test_vmicert_management.robot b/openpower/ext_interfaces/test_vmicert_management.robot
index b981f21..2cb82ca 100644
--- a/openpower/ext_interfaces/test_vmicert_management.robot
+++ b/openpower/ext_interfaces/test_vmicert_management.robot
@@ -259,6 +259,7 @@
 
 
 Send CSR To VMI And Get Signed
+    [Documentation]  Upload CSR to VMI and get signed.
     [Arguments]  ${csr}  ${force_create}  ${username}  ${password}
 
     # Description of argument(s):
diff --git a/openpower/pel/test_bmc_pel.robot b/openpower/pel/test_bmc_pel.robot
index 81d5650..2f3f217 100644
--- a/openpower/pel/test_bmc_pel.robot
+++ b/openpower/pel/test_bmc_pel.robot
@@ -715,6 +715,7 @@
 
 
 Create Error Log
+    [Documentation]  Create an error log.
     [Arguments]  ${error_severity}   ${error_creator}   ${count}
 
     # Description of argument(s):
diff --git a/pldm/test_pldm_bios.robot b/pldm/test_pldm_bios.robot
index bde9106..81d2033 100755
--- a/pldm/test_pldm_bios.robot
+++ b/pldm/test_pldm_bios.robot
@@ -82,7 +82,7 @@
     # [     attributetype]:                           BIOSStringReadOnly
     # [     currentstringlength]:                     15
 
-    ${count}=  Get Length  ${attr_table_data} 
+    ${count}=  Get Length  ${attr_table_data}
     ${attr_val_list}=  Create List
     FOR  ${i}  IN RANGE  ${count}
         Append To List  ${attr_val_list}  ${attr_table_data}[${i}][AttributeType]
diff --git a/redfish/extended/redfish_bmc_code_update.robot b/redfish/extended/redfish_bmc_code_update.robot
index 2e1df12..40fc2b2 100644
--- a/redfish/extended/redfish_bmc_code_update.robot
+++ b/redfish/extended/redfish_bmc_code_update.robot
@@ -81,7 +81,7 @@
 
     Run Keyword If  '${image_info_len}' != 0
     ...  Run Keywords  Print Timen
-    ...  The ${image_version} version is installed but not functional, try delete and continue firmware update.
+    ...  The ${image_version} version is installed but not functional, delete and continue update.
     ...    AND
     ...  Run Keyword And Ignore Error
     ...    Delete Software Object  /xyz/openbmc_project/software/${image_info['image_id']}
diff --git a/redfish/managers/test_bmc_network_mac.robot b/redfish/managers/test_bmc_network_mac.robot
index 247f876..2deae28 100644
--- a/redfish/managers/test_bmc_network_mac.robot
+++ b/redfish/managers/test_bmc_network_mac.robot
@@ -212,5 +212,3 @@
     ...  ELSE
     ...      Should Be Equal  ${status}  ${True}
     ...      msg=Not allowing the configuration of a valid MAC.
-
-
diff --git a/redfish/service_root/test_service_root_security.robot b/redfish/service_root/test_service_root_security.robot
index 35e24b2..0fa3ebe 100644
--- a/redfish/service_root/test_service_root_security.robot
+++ b/redfish/service_root/test_service_root_security.robot
@@ -16,7 +16,8 @@
 ...                     X-Frame-Options=DENY
 ...                     Pragma=no-cache
 ...                     Cache-Control=no-Store,no-Cache
-...                     Content-Security-Policy=default-src 'none'; img-src 'self' data:; font-src 'self'; style-src 'self'; script-src 'self'; connect-src 'self' wss:
+...                     Content-Security-Policy=default-src 'none'; img-src 'self' data:; font-src
+...                     'self'; style-src 'self'; script-src 'self'; connect-src 'self' wss:
 ...                     X-XSS-Protection=1; mode=block
 ...                     X-Content-Type-Options=nosniff