diff --git a/src/raygui.h b/src/raygui.h
index 2e91aff..bef1798 100644
--- a/src/raygui.h
+++ b/src/raygui.h
@@ -2692,10 +2692,9 @@ RAYGUIDEF void GuiLoadStyle(const char *fileName)
         {
             char signature[5] = "";
             short version = 0;
+            short reserved = 0;
             short numProperties = 0;
             short changedProperties = 0;
-            short reserved = 0;
-            int editionTime = 0;
 
             fread(signature, 1, 4, rgsFile);
             fread(&version, 1, sizeof(short), rgsFile);
diff --git a/tools/rGuiLayout/rguilayout.c b/tools/rGuiLayout/rguilayout.c
index b227fa9..d65da14 100644
--- a/tools/rGuiLayout/rguilayout.c
+++ b/tools/rGuiLayout/rguilayout.c
@@ -139,8 +139,7 @@ int main()
     bool anchorNewPos = false;
     bool lockAnchorMode = false;
     int saveAnchorSelected = -1;
-    GuiControl aux;
-    
+
     int snapFrameCounter = 0;
 
     bool lockMode = false;
@@ -342,31 +341,28 @@ int main()
             layout.controlsCount++;
         }
         
-        // TODO: Change controls layer order (position inside array)
+        // Change controls layer order (position inside array)
         if (IsKeyDown(KEY_LEFT_ALT) && !lockMode)
         {
             if ((IsKeyPressed(KEY_UP)) && (selectedControl < layout.controlsCount - 1))
             {
                 // Move control towards beginning of array
-                // selectedControl pos --> selectedControl - 1 pos (if possible)
-                //GuiControl prevControl = layout.controls[selectedControl - 1];
-                //for (int i = selectedControl - 1; i < layout.controlsCount - 1; i++) layout.controls[i] = layout.controls[i + 1];
-                aux = layout.controls[selectedControl];
+                GuiControl auxControl = layout.controls[selectedControl];
                 layout.controls[selectedControl] = layout.controls[selectedControl + 1];
-                layout.controls[selectedControl + 1] = aux;
+                layout.controls[selectedControl + 1] = auxControl;
             }
             else if ((IsKeyPressed(KEY_DOWN)) && (selectedControl > 0))
             {
                 // Move control towards end of array
-                aux = layout.controls[selectedControl];
+                GuiControl auxControl = layout.controls[selectedControl];
                 layout.controls[selectedControl] = layout.controls[selectedControl - 1];
-                layout.controls[selectedControl - 1] = aux;
+                layout.controls[selectedControl - 1] = auxControl;
             }
         }
         
         if (!(controlDrag || lockMode || tracemapEditMode || lockAnchorMode))
         {
-            // Check selected control (on mouse over)
+            // Check selected control (on mouse hover)
             for (int i = 0; i < layout.controlsCount; i++)
             {
                 if (controlDrag || lockMode || tracemapEditMode || lockAnchorMode) break;