diff --git a/LEGO1/lego/legoomni/include/gasstationstate.h b/LEGO1/lego/legoomni/include/gasstationstate.h
index 70ce41e8..53dbdbae 100644
--- a/LEGO1/lego/legoomni/include/gasstationstate.h
+++ b/LEGO1/lego/legoomni/include/gasstationstate.h
@@ -9,10 +9,6 @@ class GasStationState : public LegoState {
 public:
 	// SIZE 0x04
 	struct Unknown0x14 {
-		inline void SetUnknown0x00(undefined4 p_unk0x00) { m_unk0x00 = p_unk0x00; }
-		inline undefined4 GetUnknown0x00() { return m_unk0x00; }
-
-	private:
 		undefined4 m_unk0x00; // 0x00
 	};
 
@@ -36,7 +32,7 @@ public:
 	// SYNTHETIC: LEGO1 0x10006290
 	// GasStationState::`scalar deleting destructor'
 
-	inline Unknown0x14& GetUnknown0x14() { return m_unk0x14; }
+	friend class GasStation;
 
 private:
 	undefined4 m_unk0x08[3]; // 0x08
diff --git a/LEGO1/lego/legoomni/src/worlds/gasstation.cpp b/LEGO1/lego/legoomni/src/worlds/gasstation.cpp
index 46f9393c..05771709 100644
--- a/LEGO1/lego/legoomni/src/worlds/gasstation.cpp
+++ b/LEGO1/lego/legoomni/src/worlds/gasstation.cpp
@@ -62,16 +62,13 @@ MxResult GasStation::Create(MxDSAction& p_dsAction)
 	m_state = (GasStationState*) GameState()->GetState("GasStationState");
 	if (!m_state) {
 		m_state = (GasStationState*) GameState()->CreateState("GasStationState");
-		m_state->GetUnknown0x14().SetUnknown0x00(1);
+		m_state->m_unk0x14.m_unk0x00 = 1;
+	}
+	else if (m_state->m_unk0x14.m_unk0x00 == 4) {
+		m_state->m_unk0x14.m_unk0x00 = 4;
 	}
 	else {
-		GasStationState::Unknown0x14& unk0x14 = m_state->GetUnknown0x14();
-		if (unk0x14.GetUnknown0x00() == 4) {
-			unk0x14.SetUnknown0x00(4);
-		}
-		else {
-			unk0x14.SetUnknown0x00(3);
-		}
+		m_state->m_unk0x14.m_unk0x00 = 3;
 	}
 
 	GameState()->SetCurrentArea(LegoGameState::e_garage);