diff --git a/redfish/managers/test_bmc_ipv6.robot b/redfish/managers/test_bmc_ipv6.robot
index 3f845db..881e03a 100644
--- a/redfish/managers/test_bmc_ipv6.robot
+++ b/redfish/managers/test_bmc_ipv6.robot
@@ -441,6 +441,7 @@
 Validate IPv6 Network Config On BMC
     [Documentation]  Check that IPv6 network info obtained via redfish matches info
     ...              obtained via CLI.
+
     @{ipv6_network_configurations}=  Get IPv6 Network Configuration
     ${ipv6_data}=  Get BMC IPv6 Info
     FOR  ${ipv6_network_configuration}  IN  @{ipv6_network_configurations}
@@ -609,7 +610,8 @@
 
 Set SLAAC Configuration State And Verify
     [Documentation]  Set SLAAC configuration state and verify.
-    [Arguments]  ${slaac_state}  ${valid_status_codes}=[${HTTP_OK},${HTTP_ACCEPTED},${HTTP_NO_CONTENT}]  ${channel_number}=${CHANNEL_NUMBER}
+    [Arguments]  ${slaac_state}  ${valid_status_codes}=[${HTTP_OK},${HTTP_ACCEPTED},${HTTP_NO_CONTENT}]
+    ...  ${channel_number}=${CHANNEL_NUMBER}
 
     # Description of argument(s):
     # slaac_state         SLAAC state('True' or 'False').
@@ -688,6 +690,7 @@
     [Documentation]  Configure IPv6 static default gateway on BMC.
     [Arguments]  ${ipv6_gw_addr}  ${prefix_length_def}
     ...  ${valid_status_codes}=${HTTP_OK}
+
     # Description of argument(s):
     # ipv6_gw_addr          IPv6 Static Default Gateway address to be configured.
     # prefix_len_def        Prefix length value (Range 1 to 128).
@@ -746,7 +749,7 @@
     # Description of argument(s):
     # ipv6_gw_addr          IPv6 static default gateway address to be replaced (e.g. "2001:AABB:CCDD::AAFF").
     # new_static_def_gw     New static default gateway address to be configured.
-    # prefix length         Prefix length value (Range 1 to 128).
+    # prefix_length         Prefix length value (Range 1 to 128).
     # valid_status_codes    Expected return code from patch operation
     #                       (e.g. "200", "204").
 
@@ -951,7 +954,7 @@
     [Arguments]  ${ip_address_type}
 
     # Description of the argument(s):
-    # ipv4_address_type  Type of IPv4 or IPv6 address to be checked.
+    # ip_address_type  Type of IPv4 or IPv6 address to be checked.
 
     ${resp}=  Redfish.Get  ${REDFISH_NW_ETH_IFACE}${active_channel_config['${CHANNEL_NUMBER}']['name']}
     @{ip_addresses}=  Get From Dictionary  ${resp.dict}  ${ip_address_type}
diff --git a/redfish/managers/test_bmc_protocol_settings.robot b/redfish/managers/test_bmc_protocol_settings.robot
index 85003c7..ff05963 100644
--- a/redfish/managers/test_bmc_protocol_settings.robot
+++ b/redfish/managers/test_bmc_protocol_settings.robot
@@ -247,8 +247,9 @@
     [Arguments]  ${ssh_state}  ${ipmi_state}  ${persistency_check}=${False}
 
     # Description of argument(s):
-    # ssh_state     State of SSH to be set (e.g. True, False).
-    # ipmi_state    State of IPMI to be set (e.g. True, False).
+    # ssh_state          State of SSH to be set (e.g. True, False).
+    # ipmi_state         State of IPMI to be set (e.g. True, False).
+    # persistency_check  Persistency check (e.g. True, False).
 
     ${ssh_protocol_state}=  Create Dictionary  ProtocolEnabled=${ssh_state}
     ${ipmi_protocol_state}=  Create Dictionary  ProtocolEnabled=${ipmi_state}
diff --git a/redfish/managers/test_managers_bmc.robot b/redfish/managers/test_managers_bmc.robot
index baa9227..290a3ba 100644
--- a/redfish/managers/test_managers_bmc.robot
+++ b/redfish/managers/test_managers_bmc.robot
@@ -212,6 +212,9 @@
     [Documentation]  Set NTP service inactive.
     [Arguments]  ${state}
 
+    # Description of argument(s):
+    # state         NTP protocol enabled state (e.g. True, False).
+
     Redfish.Login
     Redfish.Patch  ${REDFISH_NW_PROTOCOL_URI}  body={'NTP':{'ProtocolEnabled': ${state}}}
     ...  valid_status_codes=[${HTTP_OK}, ${HTTP_NO_CONTENT}]
diff --git a/redfish/managers/test_multiple_interfaces_dhcp.robot b/redfish/managers/test_multiple_interfaces_dhcp.robot
index dc9c7b2..6b4a3ce 100644
--- a/redfish/managers/test_multiple_interfaces_dhcp.robot
+++ b/redfish/managers/test_multiple_interfaces_dhcp.robot
@@ -207,20 +207,20 @@
     [Arguments]  ${property}  ${response_data}
 
     # Description of argument(s):
-    # ${property}       DHCP Properties in dictionary.
-    # Example:
-    # property         value
-    # DHCPEnabled      :False
-    # UseDomainName    :True
-    # UseNTPServers    :True
-    # UseDNSServers    :True
-    # ${response_data}  DHCP Response data in dictionary.
-    # Example:
-    # property         value
-    # DHCPEnabled      :False
-    # UseDomainName    :True
-    # UseNTPServers    :True
-    # UseDNSServers    :True
+    # property         DHCP Properties in dictionary.
+    #   Example:
+    #   property         value
+    #   DHCPEnabled      :False
+    #   UseDomainName    :True
+    #   UseNTPServers    :True
+    #   UseDNSServers    :True
+    # response_data    DHCP Response data in dictionary.
+    #   Example:
+    #   property         value
+    #   DHCPEnabled      :False
+    #   UseDomainName    :True
+    #   UseNTPServers    :True
+    #   UseDNSServers    :True
 
    ${key_map}=  Get Dictionary Items  ${property}
    FOR  ${key}  ${value}  IN  @{key_map}