diff --git a/LEGO1/lego/legoomni/include/legonamedplane.h b/LEGO1/lego/legoomni/include/legonamedplane.h
index fd759e81..cdd50221 100644
--- a/LEGO1/lego/legoomni/include/legonamedplane.h
+++ b/LEGO1/lego/legoomni/include/legonamedplane.h
@@ -6,8 +6,7 @@
 #include "mxstring.h"
 
 // SIZE 0x4c
-class LegoNamedPlane {
-public:
+struct LegoNamedPlane {
 	// FUNCTION: LEGO1 0x10033800
 	LegoNamedPlane() {}
 
@@ -26,7 +25,6 @@ class LegoNamedPlane {
 
 	// TODO: Unclear whether this was defined
 	MxBool IsPresent() { return strcmp(m_name.GetData(), "") != 0; }
-	void Reset() { m_name = ""; }
 
 	// FUNCTION: LEGO1 0x100344d0
 	MxResult Serialize(LegoStorage* p_storage)
@@ -47,7 +45,6 @@ class LegoNamedPlane {
 		return SUCCESS;
 	}
 
-	// private:
 	MxString m_name;            // 0x00
 	Mx3DPointFloat m_position;  // 0x10
 	Mx3DPointFloat m_direction; // 0x24
diff --git a/LEGO1/lego/legoomni/include/legopathactor.h b/LEGO1/lego/legoomni/include/legopathactor.h
index 98c41d08..840cb5ec 100644
--- a/LEGO1/lego/legoomni/include/legopathactor.h
+++ b/LEGO1/lego/legoomni/include/legopathactor.h
@@ -6,7 +6,7 @@
 #include "mxtypes.h"
 
 struct LegoEdge;
-class LegoNamedPlane;
+struct LegoNamedPlane;
 class LegoPathBoundary;
 class LegoPathController;
 struct LegoPathEdgeContainer;
diff --git a/LEGO1/lego/legoomni/src/build/legocarbuild.cpp b/LEGO1/lego/legoomni/src/build/legocarbuild.cpp
index 65a0dc69..62e410ac 100644
--- a/LEGO1/lego/legoomni/src/build/legocarbuild.cpp
+++ b/LEGO1/lego/legoomni/src/build/legocarbuild.cpp
@@ -1165,7 +1165,7 @@ undefined4 LegoCarBuild::FUN_10024c20(LegoEventNotificationParam* p_param)
 				}
 
 				gameState->m_helicopter = (Helicopter*) entity;
-				gameState->m_helicopterPlane.Reset();
+				gameState->m_helicopterPlane.m_name = "";
 				break;
 			case LegoGameState::e_dunecarbuild:
 				if (gameState->m_dunebuggy) {
@@ -1173,7 +1173,7 @@ undefined4 LegoCarBuild::FUN_10024c20(LegoEventNotificationParam* p_param)
 				}
 
 				gameState->m_dunebuggy = (DuneBuggy*) entity;
-				gameState->m_dunebuggyPlane.Reset();
+				gameState->m_dunebuggyPlane.m_name = "";
 				break;
 			case LegoGameState::e_jetskibuild:
 				if (gameState->m_jetski) {
@@ -1181,7 +1181,7 @@ undefined4 LegoCarBuild::FUN_10024c20(LegoEventNotificationParam* p_param)
 				}
 
 				gameState->m_jetski = (Jetski*) entity;
-				gameState->m_jetskiPlane.Reset();
+				gameState->m_jetskiPlane.m_name = "";
 				break;
 			case LegoGameState::e_racecarbuild:
 				if (gameState->m_racecar) {
@@ -1189,7 +1189,7 @@ undefined4 LegoCarBuild::FUN_10024c20(LegoEventNotificationParam* p_param)
 				}
 
 				gameState->m_racecar = (RaceCar*) entity;
-				gameState->m_racecarPlane.Reset();
+				gameState->m_racecarPlane.m_name = "";
 				break;
 			}
 
diff --git a/LEGO1/lego/legoomni/src/worlds/isle.cpp b/LEGO1/lego/legoomni/src/worlds/isle.cpp
index d904c12e..f9eceae7 100644
--- a/LEGO1/lego/legoomni/src/worlds/isle.cpp
+++ b/LEGO1/lego/legoomni/src/worlds/isle.cpp
@@ -1487,12 +1487,12 @@ void Act1State::StopCptClickDialogue()
 // FUNCTION: LEGO1 0x100346d0
 MxBool Act1State::Reset()
 {
-	m_motocyclePlane.Reset();
-	m_bikePlane.Reset();
-	m_skateboardPlane.Reset();
+	m_motocyclePlane.m_name = "";
+	m_bikePlane.m_name = "";
+	m_skateboardPlane.m_name = "";
 	m_unk0x022 = FALSE;
 
-	m_helicopterPlane.Reset();
+	m_helicopterPlane.m_name = "";
 	if (m_helicopterWindshield) {
 		delete m_helicopterWindshield;
 		m_helicopterWindshield = NULL;
@@ -1513,7 +1513,7 @@ MxBool Act1State::Reset()
 		m_helicopter = NULL;
 	}
 
-	m_jetskiPlane.Reset();
+	m_jetskiPlane.m_name = "";
 	if (m_jetskiFront) {
 		delete m_jetskiFront;
 		m_jetskiFront = NULL;
@@ -1529,7 +1529,7 @@ MxBool Act1State::Reset()
 		m_jetski = NULL;
 	}
 
-	m_dunebuggyPlane.Reset();
+	m_dunebuggyPlane.m_name = "";
 	if (m_dunebuggyFront) {
 		delete m_dunebuggyFront;
 		m_dunebuggyFront = NULL;
@@ -1540,7 +1540,7 @@ MxBool Act1State::Reset()
 		m_dunebuggy = NULL;
 	}
 
-	m_racecarPlane.Reset();
+	m_racecarPlane.m_name = "";
 	if (m_racecarFront) {
 		delete m_racecarFront;
 		m_racecarFront = NULL;
@@ -1615,21 +1615,21 @@ void Act1State::PlaceActors()
 {
 	Isle* isle = (Isle*) FindWorld(*g_isleScript, IsleScript::c__Isle);
 
-	if (m_motocyclePlane.IsPresent()) {
+	if (strcmp(m_motocyclePlane.m_name.GetData(), "")) {
 		isle->m_motocycle->PlaceActor(m_motocyclePlane);
 	}
 	else {
 		isle->PlaceActor(isle->m_motocycle, "INT43", 4, 0.5f, 1, 0.5f);
 	}
 
-	if (m_bikePlane.IsPresent()) {
+	if (strcmp(m_bikePlane.m_name.GetData(), "")) {
 		isle->m_bike->PlaceActor(m_bikePlane);
 	}
 	else {
 		isle->PlaceActor(isle->m_bike, "INT44", 2, 0.5f, 0, 0.5f);
 	}
 
-	if (m_skateboardPlane.IsPresent()) {
+	if (strcmp(m_skateboardPlane.m_name.GetData(), "")) {
 		isle->m_skateboard->PlaceActor(m_skateboardPlane);
 	}
 	else {
@@ -1637,7 +1637,7 @@ void Act1State::PlaceActors()
 	}
 
 	if (m_helicopter != NULL) {
-		if (!m_helicopterPlane.IsPresent()) {
+		if (!strcmp(m_helicopterPlane.m_name.GetData(), "")) {
 			m_helicopter->SpawnPlayer(LegoGameState::e_unk40, FALSE, 0);
 		}
 		else {
@@ -1654,7 +1654,7 @@ void Act1State::PlaceActors()
 
 		GetViewManager()->Add(m_helicopter->GetROI());
 		m_helicopter->GetROI()->SetVisibility(TRUE);
-		m_helicopterPlane.Reset();
+		m_helicopterPlane.m_name = "";
 		m_helicopter = NULL;
 
 		if (m_helicopterWindshield != NULL) {
@@ -1677,7 +1677,7 @@ void Act1State::PlaceActors()
 	}
 
 	if (m_jetski != NULL) {
-		if (!m_jetskiPlane.IsPresent()) {
+		if (!strcmp(m_jetskiPlane.m_name.GetData(), "")) {
 			m_jetski->SpawnPlayer(LegoGameState::e_unk45, FALSE, 0);
 		}
 		else {
@@ -1690,7 +1690,7 @@ void Act1State::PlaceActors()
 
 		GetViewManager()->Add(m_jetski->GetROI());
 		m_jetski->GetROI()->SetVisibility(TRUE);
-		m_jetskiPlane.Reset();
+		m_jetskiPlane.m_name = "";
 		m_jetski = NULL;
 
 		if (m_jetskiFront != NULL) {
@@ -1707,7 +1707,7 @@ void Act1State::PlaceActors()
 	}
 
 	if (m_dunebuggy != NULL) {
-		if (!m_dunebuggyPlane.IsPresent()) {
+		if (!strcmp(m_dunebuggyPlane.m_name.GetData(), "")) {
 			m_dunebuggy->SpawnPlayer(LegoGameState::e_unk43, FALSE, 0);
 		}
 		else {
@@ -1724,7 +1724,7 @@ void Act1State::PlaceActors()
 
 		GetViewManager()->Add(m_dunebuggy->GetROI());
 		m_dunebuggy->GetROI()->SetVisibility(TRUE);
-		m_dunebuggyPlane.Reset();
+		m_dunebuggyPlane.m_name = "";
 		m_dunebuggy = NULL;
 
 		if (m_dunebuggyFront != NULL) {
@@ -1735,7 +1735,7 @@ void Act1State::PlaceActors()
 	}
 
 	if (m_racecar != NULL) {
-		if (!m_racecarPlane.IsPresent()) {
+		if (!strcmp(m_racecarPlane.m_name.GetData(), "")) {
 			m_racecar->SpawnPlayer(LegoGameState::e_unk44, FALSE, 0);
 		}
 		else {
@@ -1752,7 +1752,7 @@ void Act1State::PlaceActors()
 
 		GetViewManager()->Add(m_racecar->GetROI());
 		m_racecar->GetROI()->SetVisibility(TRUE);
-		m_racecarPlane.Reset();
+		m_racecarPlane.m_name = "";
 		m_racecar = NULL;
 
 		if (m_racecarFront != NULL) {
diff --git a/LEGO1/lego/sources/misc/legostorage.h b/LEGO1/lego/sources/misc/legostorage.h
index fb65c4c7..cae0896c 100644
--- a/LEGO1/lego/sources/misc/legostorage.h
+++ b/LEGO1/lego/sources/misc/legostorage.h
@@ -33,14 +33,6 @@ class LegoStorage {
 	// FUNCTION: LEGO1 0x10045af0
 	virtual LegoBool IsReadMode() { return m_mode == c_read; } // vtable+0x18
 
-	// FUNCTION: LEGO1 0x10006030
-	// FUNCTION: BETA10 0x10017bb0
-	LegoStorage* WriteMxString(MxString p_data)
-	{
-		WriteString(p_data.GetData());
-		return this;
-	}
-
 	// FUNCTION: BETA10 0x10017c80
 	LegoStorage* WriteString(const char* p_data)
 	{
@@ -102,18 +94,11 @@ class LegoStorage {
 		return this;
 	}
 
-	// FUNCTION: LEGO1 0x10034470
-	LegoStorage* ReadMxString(MxString& p_data)
+	// FUNCTION: LEGO1 0x10006030
+	// FUNCTION: BETA10 0x10017bb0
+	LegoStorage* WriteMxString(MxString p_data)
 	{
-		LegoS16 length;
-		ReadS16(length);
-
-		char* text = new char[length + 1];
-		Read(text, length);
-
-		text[length] = '\0';
-		p_data = text;
-		delete[] text;
+		WriteString(p_data.GetData());
 		return this;
 	}
 
@@ -178,6 +163,21 @@ class LegoStorage {
 		return this;
 	}
 
+	// FUNCTION: LEGO1 0x10034470
+	LegoStorage* ReadMxString(MxString& p_data)
+	{
+		LegoS16 length;
+		ReadS16(length);
+
+		char* text = new char[length + 1];
+		Read(text, length);
+
+		text[length] = '\0';
+		p_data = text;
+		delete[] text;
+		return this;
+	}
+
 	// SYNTHETIC: LEGO1 0x10045b00
 	// LegoStorage::`scalar deleting destructor'