diff --git a/js/002-config/fc-js-init.js b/js/002-config/fc-js-init.js
index 3fa82b1595b132ff18539cfef0d6febc6b2c8f56..784f7a7410c8b61af9d6dccb3fa5b0405b6ab4c8 100644
--- a/js/002-config/fc-js-init.js
+++ b/js/002-config/fc-js-init.js
@@ -8,50 +8,57 @@ App.Arcology = {
 	Cell: {},
 };
 App.Art = {};
+App.Corporate = {};
 App.Data = {
 	Weather: {},
 	HeroSlaves: {},
 };
 App.Debug = {};
-App.Encyclopedia = {};
-App.Encyclopedia.Entries = {};
-App.Entity = {};
-App.Entity.Utils = {};
-App.Events = {};
-App.MainView = {};
-App.UI = {};
-App.UI.DOM = {};
-App.UI.View = {};
-App.UI.SlaveInteract = {};
-App.UI.Budget = {};
-App.Update = {};
-App.Utils = {};
-App.Interact = {};
-App.Intro = {};
 App.Desc = {};
+App.Encyclopedia = {
+	Entries: {}
+};
+App.Entity = {
+	Utils: {}
+};
+App.Events = {};
 App.Facilities = {
+	Arcade: {},
 	Brothel: {},
+	Cellblock: {},
+	Clinic: {},
 	Club: {},
 	Dairy: {},
 	Farmyard: {},
-	ServantsQuarters: {},
+	HGSuite: {},
 	MasterSuite: {},
-	Spa: {},
 	Nursery: {},
-	Clinic: {},
 	Schoolroom: {},
-	Cellblock: {},
-	Arcade: {},
-	HGSuite: {}
+	ServantsQuarters: {},
+	Spa: {}
+};
+App.Interact = {};
+App.Intro = {};
+App.MainView = {};
+App.Medicine = {
+	Modification: {},
+	OrganFarm: {
+		Organs: {}
+	},
+	Surgery: {}
 };
-App.Medicine = {};
-App.Medicine.OrganFarm = {};
-App.Medicine.OrganFarm.Organs = {};
 App.RA = {};
+App.Reminders = {};
 App.SF = {};
-App.Corporate = {};
 App.SecExp = {};
-App.Reminders = {};
+App.UI = {
+	Budget: {},
+	DOM: {},
+	SlaveInteract: {},
+	View: {}
+};
+App.Update = {};
+App.Utils = {};
 
 
 Object.defineProperty(App, "activeSlave", {
diff --git a/src/js/modification.js b/src/js/modification.js
index d5e5a3b2443454b52e46615437ab68e8ba71d8ae..22ebcb1743045a38b117724e208171c3556ef5a6 100644
--- a/src/js/modification.js
+++ b/src/js/modification.js
@@ -1,5 +1,3 @@
-App.Medicine.Modification = {};
-
 /**
  * Basic application of scar
  * @param {App.Entity.SlaveState} slave
diff --git a/src/npc/surgery/surgery.js b/src/npc/surgery/surgery.js
index 743dd079b937a84324d59af694832e9696969ac0..59fccf5e02d7e045f16351e565028f5288496cc2 100644
--- a/src/npc/surgery/surgery.js
+++ b/src/npc/surgery/surgery.js
@@ -1,4 +1,3 @@
-App.Medicine.Surgery = {};
 /**
  * Composes the Procedure object from its parts
  *