diff --git a/extended/code_update/bmc_code_update.robot b/extended/code_update/bmc_code_update.robot
index 54a48c9..23293e0 100644
--- a/extended/code_update/bmc_code_update.robot
+++ b/extended/code_update/bmc_code_update.robot
@@ -284,5 +284,3 @@
     FFDC On Test Case Fail
     Run Keyword If  '${TEST_STATUS}' == 'PASS'  Check Error And Collect FFDC
     Close All Connections
-
-
diff --git a/lib/openbmc_ffdc.robot b/lib/openbmc_ffdc.robot
index ecd3116..f8c8580 100755
--- a/lib/openbmc_ffdc.robot
+++ b/lib/openbmc_ffdc.robot
@@ -48,8 +48,8 @@
     ...               3. Delete error logs and BMC dumps post FFDC collection.
     [Arguments]  ${clean_up}=${TRUE}
     # Description of argument(s):
-    # clean_up:    Boolean value indicating whether error logs and dumps should be deleted on test failure after
-    #              FFDC collection.
+    # clean_up     Boolean value indicating whether error logs and dumps should be deleted
+    #              on test failure after FFDC collection.
 
     ${OVERRIDE_FFDC_ON_TEST_CASE_FAIL}=  Get Environment Variable  OVERRIDE_FFDC_ON_TEST_CASE_FAIL  0
     ${OVERRIDE_FFDC_ON_TEST_CASE_FAIL}=  Convert To Integer  ${OVERRIDE_FFDC_ON_TEST_CASE_FAIL}
diff --git a/redfish/account_service/test_ldap_configuration.robot b/redfish/account_service/test_ldap_configuration.robot
index fbe0445..eac05e7 100644
--- a/redfish/account_service/test_ldap_configuration.robot
+++ b/redfish/account_service/test_ldap_configuration.robot
@@ -44,7 +44,8 @@
     Sleep  15s
     ${resp}=  Run Keyword And Return Status  Redfish.Login  ${LDAP_USER}
     ...  ${LDAP_USER_PASSWORD}
-    Should Be Equal  ${resp}  ${False}  msg=LDAP user was able to login even though the LDAP service was disabled.
+    Should Be Equal  ${resp}  ${False}
+    ...  msg=LDAP user was able to login even though the LDAP service was disabled.
     Redfish.Logout
     Redfish.Login
     # Enabling LDAP so that LDAP user works.
diff --git a/security/test_bmc_network_security.robot b/security/test_bmc_network_security.robot
index 0094092..529e024 100644
--- a/security/test_bmc_network_security.robot
+++ b/security/test_bmc_network_security.robot
@@ -65,7 +65,8 @@
 
 Send Network Packets And Get Packet Loss
     [Documentation]  Send TCP, UDP or ICMP packets to the target.
-    [Arguments]  ${host}  ${num}=${count}  ${packet_type}=${ICMP_PACKETS}  ${port}=80  ${icmp_type}=${ICMP_ECHO_REQUEST}
+    [Arguments]  ${host}  ${num}=${count}  ${packet_type}=${ICMP_PACKETS}
+    ...          ${port}=80  ${icmp_type}=${ICMP_ECHO_REQUEST}
 
     # Description of argument(s):
     # host         The host name or IP address of the target system.
diff --git a/templates/pgm_template.robot b/templates/pgm_template.robot
index cd02fda..0231357 100755
--- a/templates/pgm_template.robot
+++ b/templates/pgm_template.robot
@@ -28,5 +28,6 @@
 
 *** Test Cases ***
 Test Case 1
+    [Documentation]  Test case 1 documentation.
 
     Qprint Timen  First test case.