diff --git a/Modules/StateViewer/StatesList.h b/Modules/StateViewer/StatesList.h
index 150a87ee4503715e6224a059e08c026e01f586c9..13d51554074ebaca010bad3293eaeafb6725cdf8 100644
--- a/Modules/StateViewer/StatesList.h
+++ b/Modules/StateViewer/StatesList.h
@@ -7,15 +7,16 @@
 namespace StatesList
 {
 
+// Rockets states
 enum class State : int
 {
     INVALID = 0,
     INIT,
     INIT_ERROR,
-    TEST_MODE,
     SENSORS_CALIBRATION,
     ALGOS_CALIBRATION,
     DISARMED,
+    TEST_MODE,
     ARMED,
     ASCENDING,
     DROGUE_DESCENT,
@@ -23,11 +24,13 @@ enum class State : int
     LANDED,
 };
 
+// Groundstation labels
 static const QList<QString> statesLabels{
     "INIT",      "TEST\nMODE",      "SENSORS\nCALIBRATION", "DISARMED", "ARMED",
     "ASCENDING", "DROGUE\nDESCENT", "TERMINAL\nDESCENT",    "LANDED",
 };
 
+// Map from rocket states to groundstation labels
 static const QMap<State, int> statesIndexes{
     {State::INIT, 0},
     {State::INIT_ERROR, 0},