diff --git a/src/hasp_debug.cpp b/src/hasp_debug.cpp
index 2c8501d5..89f1cc08 100644
--- a/src/hasp_debug.cpp
+++ b/src/hasp_debug.cpp
@@ -600,9 +600,6 @@ void debugPrintSuffix(uint8_t tag, int level, Print * _logOutput)
 
 void debugPreSetup(JsonObject settings)
 {
-    // Link stream to debugOutput
-    // debugOutput.reserve(512);
-
     Log.begin(LOG_LEVEL_WARNING, true);
     Log.setPrefix(debugPrintPrefix); // Uncomment to get timestamps as prefix
     Log.setSuffix(debugPrintSuffix); // Uncomment to get newline as suffix
diff --git a/src/hasp_object.h b/src/hasp_object.h
index da06a429..1cdf2d0a 100644
--- a/src/hasp_object.h
+++ b/src/hasp_object.h
@@ -8,44 +8,41 @@
 #include "lvgl.h"
 
 enum lv_hasp_obj_type_t {
-    LV_HASP_BTNMATRIX = 1,
-    LV_HASP_TABLE     = 2,
+    LV_HASP_CONTAINER = 90,
+    LV_HASP_OBJECT    = 91,
+    LV_HASP_PAGE      = 92,
+
+    LV_HASP_LABEL    = 12,
+    LV_HASP_DDLIST = 50,
+    LV_HASP_ROLLER = 51,
 
     LV_HASP_BUTTON   = 10,
     LV_HASP_CHECKBOX = 11,
-    LV_HASP_LABEL    = 12,
-
-    LV_HASP_CPICKER   = 20,
-    LV_HASP_PRELOADER = 21,
-    LV_HASP_ARC       = 22,
+    LV_HASP_SWITCH = 40,
+    LV_HASP_LED    = 41,
 
     LV_HASP_SLIDER = 30,
     LV_HASP_GAUGE  = 31,
     LV_HASP_BAR    = 32,
     LV_HASP_LMETER = 33,
 
-    LV_HASP_SWITCH = 40,
-    LV_HASP_LED    = 41,
-
-    LV_HASP_DDLIST = 50,
-    LV_HASP_ROLLER = 51,
+    LV_HASP_ARC       = 22,
+    LV_HASP_PRELOADER = 21,
+    LV_HASP_CPICKER   = 20,
 
     LV_HASP_IMAGE  = 60,
     LV_HASP_IMGBTN = 61,
     LV_HASP_CANVAS = 62,
 
+    LV_HASP_BTNMATRIX = 1,
+    LV_HASP_TABLE     = 2,
+    LV_HASP_CALENDER = 81,
+    LV_HASP_CHART    = 80,
     LV_HASP_TILEVIEW = 70,
     LV_HASP_TABVIEW  = 71,
     LV_HASP_TAB      = 72,
-
-    LV_HASP_CHART    = 80,
-    LV_HASP_CALENDER = 81,
-
-    LV_HASP_CONTAINER = 90,
-    LV_HASP_OBJECT    = 91,
-    LV_HASP_PAGE      = 92,
-    LV_HASP_MSGBOX    = 93,
     LV_HASP_WINDOW    = 94,
+    LV_HASP_MSGBOX    = 93,
 };
 
 void hasp_new_object(const JsonObject & config, uint8_t & saved_page_id);