diff --git a/LEGO1/legoact2.h b/LEGO1/legoact2.h
index 41f37fea..b504c11c 100644
--- a/LEGO1/legoact2.h
+++ b/LEGO1/legoact2.h
@@ -1,13 +1,11 @@
 #ifndef LEGOACT2_H
 #define LEGOACT2_H
 
-#include "legopathactor.h"
 #include "legocarraceactor.h"
+#include "legopathactor.h"
 
 // VTABLE: LEGO1 0x100d82e0
 // SIZE: 0x1154
-class LegoAct2 : public LegoWorld {
-
-};
+class LegoAct2 : public LegoWorld {};
 
 #endif // LEGOACT2_H
diff --git a/LEGO1/legoobjectfactory.cpp b/LEGO1/legoobjectfactory.cpp
index dbec1e27..ff52bad1 100644
--- a/LEGO1/legoobjectfactory.cpp
+++ b/LEGO1/legoobjectfactory.cpp
@@ -1,104 +1,103 @@
 #include "legoobjectfactory.h"
 
-#include "decomp.h"
-#include "legomodelpresenter.h"
-#include "legotexturepresenter.h"
-#include "legophonemepresenter.h"
-#include "legoflctexturepresenter.h"
-#include "legoentitypresenter.h"
-#include "legoactorpresenter.h"
-#include "legoworldpresenter.h"
-#include "legoworld.h"
-#include "legopalettepresenter.h"
-#include "legopathpresenter.h"
-#include "legoanimpresenter.h"
-#include "legoloopinganimpresenter.h"
-#include "legolocomotionanimpresenter.h"
-#include "legohideanimpresenter.h"
-#include "legopartpresenter.h"
-#include "legocarbuildanimpresenter.h"
-#include "legoactioncontrolpresenter.h"
-#include "mxvideopresenter.h"
-#include "legoloadcachesoundpresenter.h"
-#include "lego3dwavepresenter.h"
-#include "legoactor.h"
-#include "legopathactor.h"
-#include "legoracecar.h"
-#include "legojetski.h"
-#include "jetskirace.h"
-#include "legoentity.h"
-#include "legocarraceactor.h"
-#include "legojetskiraceactor.h"
-#include "legocarbuild.h"
-#include "infocenter.h"
-#include "legoanimactor.h"
-#include "mxcontrolpresenter.h"
-#include "registrationbook.h"
-#include "historybook.h"
-#include "elevatorbottom.h"
-#include "infocenterdoor.h"
-#include "score.h"
-#include "scorestate.h"
-#include "hospital.h"
-#include "isle.h"
-#include "police.h"
-#include "gasstation.h"
-#include "legoact2.h"
-#include "legoact2state.h"
 #include "carrace.h"
-#include "hospitalstate.h"
-#include "infocenterstate.h"
-#include "policestate.h"
+#include "decomp.h"
+#include "dunebuggy.h"
+#include "elevatorbottom.h"
+#include "gasstation.h"
 #include "gasstationstate.h"
-#include "skateboard.h"
 #include "helicopter.h"
 #include "helicopterstate.h"
-#include "dunebuggy.h"
+#include "historybook.h"
+#include "hospital.h"
+#include "hospitalstate.h"
+#include "infocenter.h"
+#include "infocenterdoor.h"
+#include "infocenterstate.h"
+#include "isle.h"
+#include "jetskirace.h"
+#include "lego3dwavepresenter.h"
+#include "legoact2.h"
+#include "legoact2state.h"
+#include "legoactioncontrolpresenter.h"
+#include "legoactor.h"
+#include "legoactorpresenter.h"
+#include "legoanimactor.h"
+#include "legoanimpresenter.h"
+#include "legocarbuild.h"
+#include "legocarbuildanimpresenter.h"
+#include "legocarraceactor.h"
+#include "legoentity.h"
+#include "legoentitypresenter.h"
+#include "legoflctexturepresenter.h"
+#include "legohideanimpresenter.h"
+#include "legojetski.h"
+#include "legojetskiraceactor.h"
+#include "legoloadcachesoundpresenter.h"
+#include "legolocomotionanimpresenter.h"
+#include "legoloopinganimpresenter.h"
+#include "legomodelpresenter.h"
+#include "legopalettepresenter.h"
+#include "legopartpresenter.h"
+#include "legopathactor.h"
+#include "legopathpresenter.h"
+#include "legophonemepresenter.h"
+#include "legoracecar.h"
+#include "legotexturepresenter.h"
+#include "legoworld.h"
+#include "legoworldpresenter.h"
+#include "mxcontrolpresenter.h"
+#include "mxvideopresenter.h"
 #include "pizza.h"
 #include "pizzamissionstate.h"
-//#include "act2actor.h"
+#include "police.h"
+#include "policestate.h"
+#include "registrationbook.h"
+#include "score.h"
+#include "scorestate.h"
+#include "skateboard.h"
+// #include "act2actor.h"
 #include "act2brick.h"
-//#include "act2genactor.h"
+// #include "act2genactor.h"
 #include "act2policestation.h"
 #include "act3.h"
 #include "act3state.h"
-#include "doors.h"
-#include "legoanimmmpresenter.h"
-#include "racecar.h"
-#include "jetski.h"
-#include "bike.h"
-#include "motorcycle.h"
 #include "ambulance.h"
 #include "ambulancemissionstate.h"
+#include "bike.h"
+#include "doors.h"
+#include "jetski.h"
+#include "legoanimmmpresenter.h"
+#include "motorcycle.h"
+#include "racecar.h"
 #include "towtrack.h"
 #include "towtrackmissionstate.h"
-//#include "act3cop.h"
-//#include "act3brickster.h"
-#include "act3shark.h"
-#include "bumpbouy.h"
-#include "act3actor.h"
-#include "jetskiracestate.h"
-#include "carracestate.h"
+// #include "act3cop.h"
+// #include "act3brickster.h"
 #include "act1state.h"
+#include "act3actor.h"
+#include "act3shark.h"
+#include "beachhouseentity.h"
+#include "bumpbouy.h"
+#include "carracestate.h"
+#include "gasstationentity.h"
+#include "hospitalentity.h"
+#include "infocenterentity.h"
+#include "jetskiracestate.h"
+#include "jukeboxentity.h"
 #include "pizzeria.h"
 #include "pizzeriastate.h"
-#include "infocenterentity.h"
-#include "hospitalentity.h"
-#include "gasstationentity.h"
 #include "policeentity.h"
-#include "beachhouseentity.h"
 #include "racestandsentity.h"
-#include "jukeboxentity.h"
 #include "radiostate.h"
-//#include "caveentity.h"
-//#include "jailentity.h"
-#include "mxcompositemediapresenter.h"
+// #include "caveentity.h"
+// #include "jailentity.h"
 #include "jukebox.h"
 #include "jukeboxstate.h"
-//#include "raceskel.h"
+#include "mxcompositemediapresenter.h"
+// #include "raceskel.h"
 #include "animstate.h"
 
-
 // TODO: Before HospitalState, add all of the different LegoVehicleBuildState's
 
 // TODO: Uncomment once we have all the relevant types ready
diff --git a/LEGO1/legoracecar.h b/LEGO1/legoracecar.h
index 366b67c2..80d499c3 100644
--- a/LEGO1/legoracecar.h
+++ b/LEGO1/legoracecar.h
@@ -1,8 +1,8 @@
 #ifndef LEGOCARRACE_H
 #define LEGOCARRACE_H
 
-#include "legopathactor.h"
 #include "legocarraceactor.h"
+#include "legopathactor.h"
 
 // VTABLE: LEGO1 0x100d58b8
 // SIZE: 0x200