diff --git a/src/common/Vector3.cpp b/src/common/Vector3.cpp
index 59cdc61e..b2f7f993 100644
--- a/src/common/Vector3.cpp
+++ b/src/common/Vector3.cpp
@@ -1,8 +1,6 @@
-#include <string.h> 
-
 #include "Vector3.h"
 
 inline bool Sapphire::Common::FFXIVARR_POSITION3::operator == ( const FFXIVARR_POSITION3& target ) const
 {
-  return !memcmp( this, &target, sizeof( FFXIVARR_POSITION3 ) );
+  return x == target.x && y == target.y && z == target.z;
 }
diff --git a/src/common/Vector3.h b/src/common/Vector3.h
index 407a3983..48f5f1db 100644
--- a/src/common/Vector3.h
+++ b/src/common/Vector3.h
@@ -1,18 +1,15 @@
 #ifndef _VECTOR3_H_
 #define _VECTOR3_H_
 
-namespace Sapphire
+namespace Sapphire::Common
 {
-  namespace Common
+  struct FFXIVARR_POSITION3
   {
-    struct FFXIVARR_POSITION3
-    {
-      float x;
-      float y;
-      float z;
-      inline bool operator == ( const FFXIVARR_POSITION3& target ) const;
-    };
-  }
+    float x;
+    float y;
+    float z;
+    inline bool operator == ( const FFXIVARR_POSITION3& target ) const;
+  };
 }
 
 #endif
\ No newline at end of file