diff --git a/src/client/component/chat.cpp b/src/client/component/chat.cpp
index 14cf7474..51bab988 100644
--- a/src/client/component/chat.cpp
+++ b/src/client/component/chat.cpp
@@ -53,7 +53,7 @@ namespace chat
 		}
 	}
 
-	const char* GetClientName(const uint64_t xuid)
+	const char* get_client_name(const uint64_t xuid)
 	{
 		if (xuid < 19 && !game::is_server())
 		{
diff --git a/src/client/component/chat.hpp b/src/client/component/chat.hpp
index aae9201f..b191ebd6 100644
--- a/src/client/component/chat.hpp
+++ b/src/client/component/chat.hpp
@@ -2,5 +2,5 @@
 
 namespace chat
 {
-	const char* GetClientName(const uint64_t xuid);
+	const char* get_client_name(const uint64_t xuid);
 }
diff --git a/src/client/component/script.cpp b/src/client/component/script.cpp
index 7bdc3241..f840f406 100644
--- a/src/client/component/script.cpp
+++ b/src/client/component/script.cpp
@@ -13,16 +13,12 @@ namespace script
 	namespace
 	{
 		utils::hook::detour db_findxassetheader_hook;
-
-		struct globals_t
-		{
-			std::unordered_map<std::string, game::RawFile*> loaded_scripts;
-		} globals;
+		std::unordered_map<std::string, game::RawFile*> loaded_scripts;
 
 		game::RawFile* get_loaded_script(const std::string& name)
 		{
-			const auto itr = globals.loaded_scripts.find(name);
-			return (itr == globals.loaded_scripts.end()) ? nullptr : itr->second;
+			const auto itr = loaded_scripts.find(name);
+			return (itr == loaded_scripts.end()) ? nullptr : itr->second;
 		}
 
 		void print_loading_script(const std::string& name)
@@ -55,7 +51,7 @@ namespace script
 			rawfile->buffer = file_string;
 			rawfile->len = static_cast<int>(data.length());
 
-			globals.loaded_scripts[name] = rawfile;
+			loaded_scripts[name] = rawfile;
 		}
 
 		void load_scripts_folder(const std::string& script_dir)
@@ -85,7 +81,7 @@ namespace script
 
 		void load_scripts()
 		{
-			globals = {};
+			loaded_scripts = {};
 			const utils::nt::library host{};
 			load_scripts_folder((game::get_appdata_path() / "data/scripts").string());
 			load_scripts_folder((host.get_folder() / "boiii/scripts").string());
@@ -95,17 +91,17 @@ namespace script
 		                                        const bool error_if_missing,
 		                                        const int wait_time)
 		{
-			if (type != game::ASSET_TYPE_SCRIPTPARSETREE)
-			{
-				return db_findxassetheader_hook.invoke<game::RawFile*>(type, name, error_if_missing, wait_time);
-			}
-
 			auto* asset_header = db_findxassetheader_hook.invoke<game::RawFile*>(
 				type, name, error_if_missing, wait_time);
-			if (globals.loaded_scripts.contains(name))
-			{
-				auto* script = get_loaded_script(name);
 
+			if (type != game::ASSET_TYPE_SCRIPTPARSETREE)
+			{
+				return asset_header;
+			}
+
+			auto* script = get_loaded_script(name);
+			if (script)
+			{
 				// Copy over the checksum of the original script
 				utils::hook::copy(const_cast<char*>(script->buffer + 0x8), asset_header->buffer + 0x8, 4);
 
diff --git a/src/client/steam/interfaces/friends.cpp b/src/client/steam/interfaces/friends.cpp
index f72381c7..f1336f90 100644
--- a/src/client/steam/interfaces/friends.cpp
+++ b/src/client/steam/interfaces/friends.cpp
@@ -45,7 +45,7 @@ namespace steam
 
 	const char* friends::GetFriendPersonaName(steam_id steamIDFriend)
 	{
-		return chat::GetClientName(steamIDFriend.bits);
+		return chat::get_client_name(steamIDFriend.bits);
 	}
 
 	bool friends::GetFriendGamePlayed(steam_id steamIDFriend, void* pFriendGameInfo)