diff --git a/Controllers/LIFXController/LIFXController.cpp b/Controllers/LIFXController/LIFXController.cpp
index ff310ec53..576ef3e80 100644
--- a/Controllers/LIFXController/LIFXController.cpp
+++ b/Controllers/LIFXController/LIFXController.cpp
@@ -447,7 +447,7 @@ void LIFXController::SetExtendedColorZonesPacketSetColors(std::vector<RGBColor>
     for(size_t i = 0; i < colors.size(); i++)
     {
         hsbk_t hsbk;
-        RGBColorToHSBK(colors.at(i), &hsbk);
+        RGBColorToHSBK(colors[i], &hsbk);
 
         size_t current_color_offset = LIFX_SET_EXTENDED_COLOR_ZONES_PACKET_OFFSET_COLORS + (i * HSBK_LENGTH);
 
diff --git a/Controllers/LIFXController/RGBController_LIFX.cpp b/Controllers/LIFXController/RGBController_LIFX.cpp
index 58399557e..7485650c1 100644
--- a/Controllers/LIFXController/RGBController_LIFX.cpp
+++ b/Controllers/LIFXController/RGBController_LIFX.cpp
@@ -56,7 +56,7 @@ void RGBController_LIFX::SetupZones()
     /*---------------------------------------------------------*\
     | If there is only one zone, set up a single LED & zone     |
     \*---------------------------------------------------------*/
-    if (zone_count <= 1)
+    if(zone_count <= 1)
     {
         zone led_zone;
         led_zone.name       = "RGB Light";
@@ -74,11 +74,11 @@ void RGBController_LIFX::SetupZones()
     }
     else
     {
-        /*---------------------------------------------------------*\
-        | Set up zones                                              |
-        \*---------------------------------------------------------*/
-        for (unsigned int zone_idx = 0; zone_idx < zone_count; zone_idx++)
+        for(size_t zone_idx = 0; zone_idx < zone_count; zone_idx++)
         {
+            /*---------------------------------------------------------*\
+            | Set up zones                                              |
+            \*---------------------------------------------------------*/
             zone new_zone;
 
             new_zone.name = "LIFX Zone " + std::to_string(zone_idx + 1);
@@ -89,15 +89,14 @@ void RGBController_LIFX::SetupZones()
             new_zone.matrix_map = NULL;
 
             zones.push_back(new_zone);
-        }
 
-        /*---------------------------------------------------------*\
-        | Set up LEDs                                               |
-        \*---------------------------------------------------------*/
-        for(unsigned int zone_idx = 0; zone_idx < zones.size(); zone_idx++)
-        {
+            /*---------------------------------------------------------*\
+            | Set up LEDs                                               |
+            \*---------------------------------------------------------*/
             led new_led;
+
             new_led.name = zones[zone_idx].name + " LED";
+
             leds.push_back(new_led);
         }
     }