diff --git a/xcat/test_power_operation.robot b/xcat/test_power_operation.robot
index 22d40f1..12e8472 100644
--- a/xcat/test_power_operation.robot
+++ b/xcat/test_power_operation.robot
@@ -10,8 +10,6 @@
 
 Suite Setup     Test Suite Setup
 
-*** Variables ***
-
 *** Test Cases ***
 
 Verify Power On Via XCAT
@@ -21,7 +19,6 @@
     Execute Command On XCAT  rpower  on
     Wait Until Keyword Succeeds  10 min  10 sec  Is Host Running
 
-
 Verify Power Off Via XCAT
     [Documentation]  Power off system via XCAT and verify using REST.
     [Tags]  Verify_Power_Off_Via_XCAT
@@ -29,15 +26,13 @@
     Execute Command On XCAT  rpower  off
     Wait Until Keyword Succeeds  6 min  10 sec  Is Host Off
 
-
 Verify BMC State Via XCAT
     [Documentation]  Verify BMC state using REST and XCAT.
     [Tags]  Verify_BMC_State_Via_XCAT
 
     ${xcat_resp}=  Execute Command On XCAT  rpower  bmcstate
     ${rest_resp}=  Get BMC State
-    Should contain  ${xcat_resp}  ${rest_resp}
-
+    Should Contain  ${xcat_resp}  ${rest_resp}
 
 Verify Soft Power Off Followed With Power On
     [Documentation]  Verify soft power off system followed with power on.
@@ -50,7 +45,6 @@
     Execute Command On XCAT  rpower  on
     Wait Until Keyword Succeeds  10 min  10 sec  Is Host Running
 
-
 Verify Hard Power Off Followed With Power On
     [Documentation]  Verify hard power off system followed with power on.
     [Tags]  Verify_Hard_Power_Off_Followed_With_Power_On
@@ -62,7 +56,6 @@
     Execute Command On XCAT  rpower  on
     Wait Until Keyword Succeeds  10 min  10 sec  Is Host Running
 
-
 *** Keywords ***
 
 Test Suite Setup
diff --git a/xcat/test_xcat_group.robot b/xcat/test_xcat_group.robot
index 1a553d7..34e6496 100644
--- a/xcat/test_xcat_group.robot
+++ b/xcat/test_xcat_group.robot
@@ -12,8 +12,8 @@
 
 *** Variables ***
 
-${poweron_flag}   ON
-${poweroff_flag}  OFF
+${POWERON_FLAG}             ON
+${POWEROFF_FLAG}            OFF
 ${NUM_POWER_STATUS_CHECKS}  1000
 
 *** Test Cases ***
@@ -28,7 +28,6 @@
       Validate Added Node  ${bmc}
     END
 
-
 Power On Via XCAT And Validate
     [Documentation]  Power on via XCAT and validate.
     [Tags]  Power_On_Via_XCAT_And_Validate
@@ -36,10 +35,9 @@
     # Power on each BMC node and validate the power status.
     FOR  ${bmc}  IN  @{BMC_LIST}
       Power On Via XCAT  ${bmc}
-      Validate Power Status Via XCAT  ${bmc}  ${poweron_flag}
+      Validate Power Status Via XCAT  ${bmc}  ${POWERON_FLAG}
     END
 
-
 Power Off Via XCAT And Validate
     [Documentation]  Power off via XCAT and validate.
     [Tags]  Power_Off_Via_XCAT_And_Validate
@@ -47,10 +45,9 @@
     # Power off each BMC node and validate the power status.
     FOR  ${bmc}  IN  @{BMC_LIST}
       Power Off Via XCAT  ${bmc}
-      Validate Power Status Via XCAT  ${bmc}  ${poweroff_flag}
+      Validate Power Status Via XCAT  ${bmc}  ${POWEROFF_FLAG}
     END
 
-
 Add Nodes To Group List
     [Documentation]  Add BMC nodes into group.
     [Tags]  Add_Nodes_To_Group_List
@@ -61,7 +58,6 @@
       Validate Node Added In Group  ${bmc}  ${GROUP}
     END
 
-
 Power On Group And Validate
     [Documentation]  Power on all BMCs in group and validate.
     [Tags]  Power_On_Group_And_Validate
@@ -81,10 +77,9 @@
 
     # Validate power status on each BMC node one by one.
     FOR  ${bmc_node}  IN  @{bmc_nodes}
-      Validate Power Status Via XCAT  ${bmc_node}  ${poweron_flag}
+      Validate Power Status Via XCAT  ${bmc_node}  ${POWERON_FLAG}
     END
 
-
 Power Off Group And Validate
     [Documentation]  Power off all BMCs in group and validate.
     [Tags]  Power_Off_Group_And_Validate
@@ -103,10 +98,9 @@
 
     # Validate power status on each BMC node one by one.
     FOR  ${bmc_node}  IN  @{bmc_nodes}
-      Validate Power Status Via XCAT  ${bmc_node}  ${poweroff_flag}
+      Validate Power Status Via XCAT  ${bmc_node}  ${POWEROFF_FLAG}
     END
 
-
 Continuous Node Power Status
     [Documentation]  Continuously get the power status.
     # This keyword verifies the REST connectivity between XCAT and the BMC node.
@@ -122,10 +116,9 @@
     # of the BMC node
 
     FOR  ${index}  IN RANGE  1  ${NUM_POWER_STATUS_CHECKS}
-      Validate Power Status Via XCAT  ${BMC_LIST[1]}  ${poweron_flag}
+      Validate Power Status Via XCAT  ${BMC_LIST[1]}  ${POWERON_FLAG}
     END
 
-
 Get Temperature Reading Via XCAT
     [Documentation]  Get temperature reading via XCAT.
     [Tags]  Get_Temperature_Reading_Via_XCAT
@@ -149,7 +142,6 @@
       Log  \n Temperature reading on $[bmc}\n ${temp_reading}
     END
 
-
 Get Fanspeed Reading Via XCAT
     [Documentation]  Get fanspeed via XCAT.
     [Tags]  Get_Fanspeed_Reading_Via_XCAT
@@ -168,7 +160,6 @@
       Log  \n fanspeed on $[bmc}\n ${fanspeed}
     END
 
-
 Get Voltage Reading Via XCAT
     [Documentation]  Get voltage via XCAT.
     [Tags]  Get_Voltage_Reading_Via_XCAT
@@ -184,7 +175,6 @@
       Log  \n Voltage reading on $[bmc}\n ${voltage}
     END
 
-
 Get Wattage Via XCAT
     [Documentation]  Get wattage via XCAT.
     [Tags]  Get_Wattage_Via_XCAT
diff --git a/xcat/test_xcat_inventory.robot b/xcat/test_xcat_inventory.robot
index c8a9f94..b9d3d80 100644
--- a/xcat/test_xcat_inventory.robot
+++ b/xcat/test_xcat_inventory.robot
@@ -7,8 +7,6 @@
 
 Suite Setup     XCAT Suite Setup
 
-*** Variables ***
-
 *** Test Cases ***
 
 Verify BMC Version Via XCAT
@@ -21,8 +19,7 @@
     # Get BMC version info via rest
     ${version_via_rest}=  Get BMC Version
 
-    Should contain  ${version_via_xcat}  ${version_via_rest}
-
+    Should Contain  ${version_via_xcat}  ${version_via_rest}
 
 *** Keywords ***