diff --git a/rescueapp/lib/start_triage_system/triage_data.dart b/rescueapp/lib/start_triage_system/triage_data.dart
index 371abda930eb7bca3f0ec30d28525d054a310cf5..77c135e3b9ed85b05b8e0ddc6543fa293ce28661 100644
--- a/rescueapp/lib/start_triage_system/triage_data.dart
+++ b/rescueapp/lib/start_triage_system/triage_data.dart
@@ -1,17 +1,29 @@
-class SuperCategory {
+// Superclasses ----------------------------------------------------------------
+
+class Category {
   bool isAmbulatory;
   bool isSpontaneousBreathingPresent;
 
-  SuperCategory(this.isAmbulatory, this.isSpontaneousBreathingPresent);
+  Category(this.isAmbulatory, this.isSpontaneousBreathingPresent);
+}
+
+class Category2 extends Category {
+  bool isBreathingFrequencyPerMinute;
+  bool isCirculation;
+
+  Category2(this.isBreathingFrequencyPerMinute, this.isCirculation)
+      : super(false, true);
 }
 
-class CategoryT1A extends SuperCategory {
+// Subclasses ------------------------------------------------------------------
+
+class CategoryT1A extends Category {
   bool isAfterOpeningAirways = true;
 
   CategoryT1A(this.isAfterOpeningAirways) : super(false, false);
 }
 
-class CategoryT1B extends SuperCategory {
+class CategoryT1B extends Category {
   bool isBreathingFrequencyPerMinute = true;
 
   CategoryT1B(
@@ -19,33 +31,25 @@ class CategoryT1B extends SuperCategory {
       ) : super(false, true);
 }
 
-class SuperCategory2 extends SuperCategory {
-  bool isBreathingFrequencyPerMinute;
-  bool isCirculation;
-
-  SuperCategory2(this.isBreathingFrequencyPerMinute, this.isCirculation)
-      : super(false, true);
-}
-
-class CategoryT1C extends SuperCategory2 {
+class CategoryT1C extends Category2 {
   CategoryT1C() : super(false, true);
 }
 
-class CategoryT1D extends SuperCategory2 {
+class CategoryT1D extends Category2 {
   bool isNeurology = false;
   CategoryT1D(this.isNeurology) : super(false, false);
 }
 
-class CategoryT2 extends SuperCategory2 {
+class CategoryT2 extends Category2 {
   bool isNeurology = true;
   CategoryT2(this.isNeurology) : super(false, false);
 }
 
-class CategoryT3 extends SuperCategory {
+class CategoryT3 extends Category {
   CategoryT3() : super(true, null);
 }
 
-class CategoryT4 extends SuperCategory {
+class CategoryT4 extends Category {
   bool isAfterOpeningAirways = false;
 
   CategoryT4(this.isAfterOpeningAirways) : super(false, false);