diff --git a/.gitmodules b/.gitmodules
index d0a70bd..83f6ca9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,6 +4,3 @@
 [submodule "lib/cmake-modules"]
 	path = lib/cmake-modules
 	url = https://github.com/Zeex/cmake-modules
-[submodule "src/plugin-natives"]
-	path = src/plugin-natives
-	url = https://github.com/Y-Less/plugin-natives
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index 513a628..70c681f 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -76,5 +76,5 @@
             "cppStandard": "c++17"
         }
     ],
-    "version": 3
+    "version": 4
 }
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 2b0e592..daaddb9 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -17,7 +17,8 @@
     "filesystem": "cpp",
     "xstring": "cpp",
     "system_error": "cpp",
-    "memory": "cpp"
+    "memory": "cpp",
+    "thread": "cpp"
   },
   "C_Cpp.clang_format_style": "WebKit"
 }
diff --git a/src/main.cpp b/src/main.cpp
index 1675d94..44a11f2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -30,8 +30,9 @@ PLUGIN_EXPORT bool PLUGIN_CALL Load(void** ppData)
 }
 
 extern "C" const AMX_NATIVE_INFO native_list[] = {
-    {"UUID", Natives::UUID},
-    {NULL, NULL}};
+    { "UUID", Natives::UUID },
+    { NULL, NULL }
+};
 
 PLUGIN_EXPORT int PLUGIN_CALL AmxLoad(AMX* amx)
 {
@@ -44,7 +45,7 @@ PLUGIN_EXPORT int PLUGIN_CALL Unload()
     return 1;
 }
 
-PLUGIN_EXPORT int PLUGIN_CALL AmxUnload()
+PLUGIN_EXPORT int PLUGIN_CALL AmxUnload(AMX* amx)
 {
     return 1;
 }
diff --git a/src/natives.cpp b/src/natives.cpp
index 597bab2..f245e91 100644
--- a/src/natives.cpp
+++ b/src/natives.cpp
@@ -17,9 +17,9 @@ The code here acts as the translation between AMX data types and native types.
 //    return 0;
 //}
 
- cell Natives::UUID(AMX* amx, cell* params)
- {
-     auto uuid = Impl::UUID();
-     amx_SetCppString(amx, params[1], uuid, params[2]);
-     return 0;
- }
+cell Natives::UUID(AMX* amx, cell* params)
+{
+    auto uuid = Impl::UUID();
+    amx_SetCppString(amx, params[1], uuid, params[2]);
+    return 0;
+}
diff --git a/src/natives.hpp b/src/natives.hpp
index 1e6e219..d61849f 100644
--- a/src/natives.hpp
+++ b/src/natives.hpp
@@ -17,9 +17,8 @@ Contains all the `PAWN_NATIVE_DECL` for native function declarations.
 
 //PAWN_NATIVE_DECL(uuid, UUID, bool(char*))
 
-namespace Natives
-{
-cell UUID(AMX *amx, cell *params);
+namespace Natives {
+cell UUID(AMX* amx, cell* params);
 }
 
 #endif