diff --git a/src/005-passages/eventsPassages.js b/src/005-passages/eventsPassages.js
index a4045c817fe2e30c62302dc94346bb85d4810580..f8f79b5a424d51d475a3d53b88d11d4e6295fcce 100644
--- a/src/005-passages/eventsPassages.js
+++ b/src/005-passages/eventsPassages.js
@@ -1,3 +1,4 @@
+/* ### Scheduled Events ### */
 new App.DomPassage("SE Burst",
 	() => {
 		V.nextButton = "Continue";
@@ -25,6 +26,12 @@ new App.DomPassage("SE Birth",
 	}
 );
 
+new App.DomPassage("SE pit fight", () => App.Facilities.Pit.fight(V.pit.lethal));
+
+new App.DomPassage("SE pc birthday", () => App.Events.pcBirthday.runEvent());
+
+/* ### Non Random Events ### */
+
 new App.DomPassage("Murder Attempt", () => {
 		if (V.event === "slave trade") {
 			return App.Events.murderAttemptFollowup("slave", V.illegalDeals.slave.company, V.illegalDeals.slave.type);
@@ -36,8 +43,4 @@ new App.DomPassage("Murder Attempt", () => {
 			return App.Events.murderAttempt();
 		}
 	}
-);
-
-new App.DomPassage("SE pit fight", () => App.Facilities.Pit.fight(V.pit.lethal));
-
-new App.DomPassage("SE pc birthday", () => App.Events.pcBirthday.runEvent());
+);
\ No newline at end of file
diff --git a/src/005-passages/facilitiesPassages.js b/src/005-passages/facilitiesPassages.js
index 135df2e1bbc9852aa6143fb350328768646e2b76..8f67d52b80b0f932fb042163700b89491ca12ff7 100644
--- a/src/005-passages/facilitiesPassages.js
+++ b/src/005-passages/facilitiesPassages.js
@@ -1,3 +1,9 @@
+/* ### Standard Facilities ### */
+new App.DomPassage("Pit", () => { return App.Facilities.Pit.pit(); }, ["jump-to-safe", "jump-from-safe"]);
+
+new App.DomPassage("Incubator", () => { return App.UI.incubator(); }, ["jump-to-safe", "jump-from-safe"]);
+
+/* ### Slave Interact Facilities ### */
 new App.DomPassage("Wardrobe",
 	() => {
 		V.nextButton = "Back";
@@ -7,8 +13,6 @@ new App.DomPassage("Wardrobe",
 	}, ["jump-to-safe", "jump-from-safe"]
 );
 
-new App.DomPassage("Pit", () => { return App.Facilities.Pit.pit(); }, ["jump-to-safe", "jump-from-safe"]);
-
 new App.DomPassage("Salon",
 	() => {
 		V.nextButton = "Confirm changes";
@@ -29,8 +33,7 @@ new App.DomPassage("Body Modification",
 	}, ["jump-to-safe", "jump-from-safe"]
 );
 
-new App.DomPassage("Incubator", () => { return App.UI.incubator(); }, ["jump-to-safe", "jump-from-safe"]);
-
+/* ### Special Facilities ### */
 new App.DomPassage("Agent Select",
 	() => {
 		V.nextButton = "Back";
diff --git a/src/005-passages/interactPassages.js b/src/005-passages/interactPassages.js
index 18dc0d7b7672b77f2710b314669079b9f9200e64..d04947c2ba4414ae06cd52b643f3a517d96435d2 100644
--- a/src/005-passages/interactPassages.js
+++ b/src/005-passages/interactPassages.js
@@ -1,3 +1,4 @@
+/* ### Central Slave Interact ### */
 new App.DomPassage("Slave Interact",
 	() => {
 		V.nextButton = "Confirm changes";
@@ -7,6 +8,7 @@ new App.DomPassage("Slave Interact",
 	}
 );
 
+/* ### Single Interaction ### */
 new App.DomPassage("BeastFucked", () => App.Interact.fAnimal(getSlave(V.AS), V.animalType));
 
 new App.DomPassage("SlaveOnSlaveFeeding",