diff --git a/lib/rest_client.robot b/lib/rest_client.robot
index 859414c..a015e43 100644
--- a/lib/rest_client.robot
+++ b/lib/rest_client.robot
@@ -45,11 +45,10 @@
     ${base_uri}=    Catenate    SEPARATOR=    ${DBUS_PREFIX}    ${uri}
     ${headers}=  Create Dictionary  X-Auth-Token=${XAUTH_TOKEN}  Accept=application/json
     Set To Dictionary  ${kwargs}  headers  ${headers}
-    IF  '${quiet}' == '${0}'  Log Request  method=Get
-        ...  base_uri=${base_uri}  args=&{kwargs}
-    END
+    Run Keyword If  '${quiet}' == '${0}'  Log Request  method=Get
+    ...  base_uri=${base_uri}  args=&{kwargs}
     ${resp}=  GET On Session  openbmc  ${base_uri}  &{kwargs}  timeout=${timeout}  expected_status=any
-    IF  '${quiet}' == '${0}'  Log Response  ${resp}
+    Run Keyword If  '${quiet}' == '${0}'  Log Response  ${resp}
     Delete All Sessions
     RETURN    ${resp}
 
@@ -73,11 +72,10 @@
     ${headers}=  Create Dictionary   Content-Type=application/json
     ...  X-Auth-Token=${XAUTH_TOKEN}
     Set To Dictionary  ${kwargs}  headers  ${headers}
-    IF  '${quiet}' == '${0}'  Log Request  method=Post
-        ...  base_uri=${base_uri}  args=&{kwargs}
-    END
+    Run Keyword If  '${quiet}' == '${0}'  Log Request  method=Post
+    ...  base_uri=${base_uri}  args=&{kwargs}
     ${ret}=  POST On Session  openbmc  ${base_uri}  &{kwargs}  timeout=${timeout}
-    IF  '${quiet}' == '${0}'  Log Response  ${ret}
+    Run Keyword If  '${quiet}' == '${0}'  Log Response  ${ret}
     Delete All Sessions
     RETURN    ${ret}
 
@@ -123,11 +121,10 @@
     ${headers}=  Create Dictionary   Content-Type=application/json
     ...  X-Auth-Token=${XAUTH_TOKEN}
     Set To Dictionary   ${kwargs}  headers   ${headers}
-    IF  '${quiet}' == '${0}'  Log Request  method=Delete
-        ...  base_uri=${base_uri}  args=&{kwargs}
-    END
+    Run Keyword If  '${quiet}' == '${0}'  Log Request  method=Delete
+    ...  base_uri=${base_uri}  args=&{kwargs}
     ${ret}=  DELETE On Session  openbmc  ${base_uri}  &{kwargs}  timeout=${timeout}
-    IF  '${quiet}' == '${0}'  Log Response    ${ret}
+    Run Keyword If  '${quiet}' == '${0}'  Log Response    ${ret}
     Delete All Sessions
     RETURN    ${ret}
 
@@ -271,9 +268,8 @@
     ${resp}=  OpenBMC Get Request  ${uri}attr/${attr}  timeout=${timeout}
     ...  quiet=${quiet}
     Should Be Equal As Strings  ${resp.status_code}  ${HTTP_OK}
-    IF  '${expected_value}' != '${EMPTY}'
-        ...  Should Be Equal As Strings  ${expected_value}  ${resp.json()["data"]}
-    END
+    Run Keyword If  '${expected_value}' != '${EMPTY}'
+    ...  Should Be Equal As Strings  ${expected_value}  ${resp.json()["data"]}
     RETURN    ${resp.json()["data"]}
 
 
@@ -372,18 +368,17 @@
     # If /redfish/v1/SessionService/Sessions POST fails, fallback to
     # REST /login method.
     ${passed}=  Run Keyword And Return Status   Redfish Login
-    IF  ${passed} != True   Initialize OpenBMC  ${timeout}  quiet=${quiet}
+    Run Keyword If  ${passed} != True   Initialize OpenBMC  ${timeout}  quiet=${quiet}
     ${session_object}=  Set Variable If  ${passed}  redfish  openbmc
 
     ${base_uri}=  Catenate  SEPARATOR=  ${DBUS_PREFIX}  ${uri}
     ${headers}=  Create Dictionary  Content-Type=application/octet-stream
     ...  X-Auth-Token=${XAUTH_TOKEN}  Accept=application/json
     Set To Dictionary  ${kwargs}  headers  ${headers}
-    IF  '${quiet}' == '${0}'  Log Request  method=Post
-        ...  base_uri=${base_uri}  args=&{kwargs}
-    END
+    Run Keyword If  '${quiet}' == '${0}'  Log Request  method=Post
+    ...  base_uri=${base_uri}  args=&{kwargs}
     ${ret}=  POST On Session  ${session_object}  ${base_uri}  &{kwargs}  timeout=${timeout}
-    IF  '${quiet}' == '${0}'  Log Response  ${ret}
+    Run Keyword If  '${quiet}' == '${0}'  Log Response  ${ret}
     Valid Value  ret.status_code  ${valid_status_codes}
     Delete All Sessions
 
@@ -436,11 +431,9 @@
     ${base_uri}=  Catenate  SEPARATOR=  ${DBUS_PREFIX}  ${uri}
     ${headers}=  Create Dictionary  Content-Type=application/json  X-Auth-Token=${XAUTH_TOKEN}
     Set To Dictionary   ${kwargs}  headers  ${headers}
-    IF  '${quiet}' == '${0}'  Log Request  method=Post
-        ...  base_uri=${base_uri}  args=&{kwargs}
-    END
+    Run Keyword If  '${quiet}' == '${0}'  Log Request  method=Post  base_uri=${base_uri}  args=&{kwargs}
     ${resp}=  GET On Session  redfish  ${base_uri}  &{kwargs}  timeout=${timeout}
-    IF  '${quiet}' == '${0}'  Log Response  ${resp}
+    Run Keyword If  '${quiet}' == '${0}'  Log Response  ${resp}
 
     RETURN  ${resp}
 
@@ -462,10 +455,8 @@
     ${base_uri}=  Catenate  SEPARATOR=  ${DBUS_PREFIX}  ${uri}
     ${headers}=  Create Dictionary  Content-Type=application/json  X-Auth-Token=${XAUTH_TOKEN}
     Set To Dictionary   ${kwargs}  headers  ${headers}
-    IF  '${quiet}' == '${0}'  Log Request  method=Post
-       ...  base_uri=${base_uri}  args=&{kwargs}
-    END
+    Run Keyword If  '${quiet}' == '${0}'  Log Request  method=Post  base_uri=${base_uri}  args=&{kwargs}
     ${resp}=  POST On Session  redfish  ${base_uri}  &{kwargs}  timeout=${timeout}  expected_status=any
-    IF  '${quiet}' == '${0}'  Log Response  ${resp}
+    Run Keyword If  '${quiet}' == '${0}'  Log Response  ${resp}
 
     RETURN  ${resp}