diff --git a/lib/fan_utils.robot b/lib/fan_utils.robot
index b6445b8..d7b6a3c 100755
--- a/lib/fan_utils.robot
+++ b/lib/fan_utils.robot
@@ -37,14 +37,15 @@
     #             added to.  This list is returned to the caller.
 
     ${fan_uris}=  Get Endpoint Paths  ${HOST_INVENTORY_URI}system  fan
-    : FOR  ${fan_uri}  IN  @{fan_uris}
-    \  ${fan_properties}=  Read Properties  ${fan_uri}
-    \  ${fan_present}=  Get Variable Value  ${fan_properties['Present']}  0
-    \  ${fan_functional}=  Get Variable Value
-    ...  ${fan_properties['Functional']}  0
-    \  Continue For Loop If  ${fan_present} == 0 or ${fan_functional} == 0
-    \  ${remaining_uri}  ${fan_name}=  Split Path  ${fan_uri}
-    \  Append To List  ${fan_names}  ${fan_name}
+    FOR  ${fan_uri}  IN  @{fan_uris}
+        ${fan_properties}=  Read Properties  ${fan_uri}
+        ${fan_present}=  Get Variable Value  ${fan_properties['Present']}  0
+        ${fan_functional}=  Get Variable Value
+        ...  ${fan_properties['Functional']}  0
+        Continue For Loop If  ${fan_present} == 0 or ${fan_functional} == 0
+        ${remaining_uri}  ${fan_name}=  Split Path  ${fan_uri}
+        Append To List  ${fan_names}  ${fan_name}
+    END
 
     [Return]  ${fan_names}
 
diff --git a/lib/pdu/pdu.robot b/lib/pdu/pdu.robot
index 3bd2b56..6c9be1b 100644
--- a/lib/pdu/pdu.robot
+++ b/lib/pdu/pdu.robot
@@ -7,8 +7,9 @@
 Validate Prereq
     [Documentation]  Validate prerequisites for PDU.
     ${PDU_VAR_LIST}=    Create List    PDU_TYPE    PDU_IP  PDU_USERNAME    PDU_PASSWORD    PDU_SLOT_NO
-    : FOR    ${PDU_VAR}    IN    @{PDU_VAR_LIST}
-    \    Should Not Be Empty    ${${PDU_VAR}}   msg=Unable to find variable ${PDU_VAR}
+    FOR    ${PDU_VAR}    IN    @{PDU_VAR_LIST}
+        Should Not Be Empty    ${${PDU_VAR}}   msg=Unable to find variable ${PDU_VAR}
+    END
 
 PDU Power Cycle
     [Documentation]  Perform PDU power cycle.
diff --git a/lib/snmp/snmp_utils.robot b/lib/snmp/snmp_utils.robot
index 29dfd91..d78122d 100644
--- a/lib/snmp/snmp_utils.robot
+++ b/lib/snmp/snmp_utils.robot
@@ -93,11 +93,12 @@
     # port           Network port where SNMP manager is listening.
 
     ${snmp_objs}=  Read Properties  ${SNMP_MANAGER_URI}enumerate
-    : FOR  ${snmp_obj}  IN   @{snmp_objs}
-    \  ${obj}=  Set Variable  ${snmp_objs['${snmp_obj}']}
-    \   Run Keyword If
-    ...  '${obj['Address']}' == '${ip}' and '${obj['Port']}' == '${port}'
-    ...    Return From Keyword  ${snmp_obj}
+    FOR  ${snmp_obj}  IN   @{snmp_objs}
+        ${obj}=  Set Variable  ${snmp_objs['${snmp_obj}']}
+        Run Keyword If
+        ...  '${obj['Address']}' == '${ip}' and '${obj['Port']}' == '${port}'
+        ...    Return From Keyword  ${snmp_obj}
+    END
 
     Return From Keyword  ${EMPTY}