diff --git a/LEGO1/lego3dview.cpp b/LEGO1/lego3dview.cpp
index 14fcfaaa..2bbb57ae 100644
--- a/LEGO1/lego3dview.cpp
+++ b/LEGO1/lego3dview.cpp
@@ -1,4 +1,5 @@
 #include "lego3dview.h"
+
 #include "legoroi.h"
 
 // STUB: LEGO1 0x1003dd70
diff --git a/LEGO1/lego3dview.h b/LEGO1/lego3dview.h
index a16e3f35..cafca31a 100644
--- a/LEGO1/lego3dview.h
+++ b/LEGO1/lego3dview.h
@@ -1,8 +1,8 @@
 #ifndef LEGO3DVIEW_H
 #define LEGO3DVIEW_H
 
-#include "viewmanager/viewmanager.h"
 #include "mxtypes.h"
+#include "viewmanager/viewmanager.h"
 
 class LegoROI;
 
diff --git a/LEGO1/legoomni.h b/LEGO1/legoomni.h
index 2f882f76..20f09922 100644
--- a/LEGO1/legoomni.h
+++ b/LEGO1/legoomni.h
@@ -115,7 +115,7 @@ class LegoOmni : public MxOmni {
 	MxDSAction& GetCurrentAction() { return m_action; }
 
 private:
-	undefined4* m_unk0x68;                        // 0x68
+	undefined4* m_unk0x68;                       // 0x68
 	undefined4 m_unk0x6c;                        // 0x6c
 	LegoInputManager* m_inputMgr;                // 0x70
 	GifManager* m_gifManager;                    // 0x74
diff --git a/LEGO1/mxactionnotificationparam.cpp b/LEGO1/mxactionnotificationparam.cpp
index 0bd93281..b5d84832 100644
--- a/LEGO1/mxactionnotificationparam.cpp
+++ b/LEGO1/mxactionnotificationparam.cpp
@@ -9,18 +9,18 @@ MxNotificationParam* MxActionNotificationParam::Clone()
 	return new MxActionNotificationParam(this->m_type, this->m_sender, this->m_action, this->m_realloc);
 }
 
-// FUNCTION: LEGO1 0x100b0300
-MxNotificationParam* MxStartActionNotificationParam::Clone()
-{
-	return new MxEndActionNotificationParam(c_notificationStartAction, this->m_sender, this->m_action, this->m_realloc);
-}
-
 // FUNCTION: LEGO1 0x10051270
 MxNotificationParam* MxEndActionNotificationParam::Clone()
 {
 	return new MxEndActionNotificationParam(c_notificationEndAction, this->m_sender, this->m_action, this->m_realloc);
 }
 
+// FUNCTION: LEGO1 0x100b0300
+MxNotificationParam* MxStartActionNotificationParam::Clone()
+{
+	return new MxEndActionNotificationParam(c_notificationStartAction, this->m_sender, this->m_action, this->m_realloc);
+}
+
 // FUNCTION: LEGO1 0x100b04f0
 MxNotificationParam* MxType4NotificationParam::Clone()
 {
diff --git a/LEGO1/mxactionnotificationparam.h b/LEGO1/mxactionnotificationparam.h
index 68c136c4..b67d0321 100644
--- a/LEGO1/mxactionnotificationparam.h
+++ b/LEGO1/mxactionnotificationparam.h
@@ -88,11 +88,7 @@ class MxEndActionNotificationParam : public MxActionNotificationParam {
 // SIZE 0x18
 class MxType4NotificationParam : public MxActionNotificationParam {
 public:
-	inline MxType4NotificationParam(
-		MxCore* p_sender,
-		MxDSAction* p_action,
-		undefined4 p_unk0x14
-	)
+	inline MxType4NotificationParam(MxCore* p_sender, MxDSAction* p_action, undefined4 p_unk0x14)
 		: MxActionNotificationParam(TYPE4, p_sender, p_action, FALSE)
 	{
 		m_unk0x14 = p_unk0x14;
diff --git a/LEGO1/mxstreamcontroller.cpp b/LEGO1/mxstreamcontroller.cpp
index a29c2740..56908000 100644
--- a/LEGO1/mxstreamcontroller.cpp
+++ b/LEGO1/mxstreamcontroller.cpp
@@ -118,6 +118,21 @@ MxResult MxStreamController::VTable0x2c(MxDSAction* p_action, MxU32 p_bufferval)
 	return FUN_100c1800(p_action, (p_bufferval / m_provider->GetFileSize()) * m_provider->GetFileSize());
 }
 
+// FUNCTION: LEGO1 0x100c1e70
+MxCore* MxStreamController::FUN_100c1e70(MxDSAction& p_obj)
+{
+	MxAutoLocker locker(&m_criticalSection);
+	MxCore* result = NULL;
+	if (p_obj.GetObjectId() != -1) {
+		MxDSAction* action = m_unk0x3c.Find(&p_obj, FALSE);
+		if (action != NULL) {
+			result = (MxCore*) action->GetUnknown28();
+		}
+	}
+
+	return result;
+}
+
 // FUNCTION: LEGO1 0x100c1ce0
 MxResult MxStreamController::VTable0x30(MxDSAction* p_action)
 {
@@ -140,23 +155,6 @@ MxResult MxStreamController::FUN_100c1f00(MxDSAction* p_action)
 	return FAILURE;
 }
 
-// FUNCTION: LEGO1 0x100c1e70
-MxCore* MxStreamController::FUN_100c1e70(MxDSAction& p_obj)
-{
-	MxAutoLocker locker(&m_criticalSection);
-	MxCore* result = NULL;
-	if (p_obj.GetObjectId() != -1)
-	{
-		MxDSAction* action = m_unk0x3c.Find(&p_obj, FALSE);
-		if (action != NULL)
-		{
-			result = (MxCore*)action->GetUnknown28();
-		}
-	}
-
-	return result;
-}
-
 // STUB: LEGO1 0x100c20d0
 MxBool MxStreamController::FUN_100c20d0(MxDSObject& p_obj)
 {