diff --git a/Amalgam/src/Features/CritHack/CritHack.cpp b/Amalgam/src/Features/CritHack/CritHack.cpp
index 719fb733..72a89dfe 100644
--- a/Amalgam/src/Features/CritHack/CritHack.cpp
+++ b/Amalgam/src/Features/CritHack/CritHack.cpp
@@ -582,6 +582,8 @@ static void* s_pCTFGameStats = nullptr;
 MAKE_HOOK(CTFGameStats_FindPlayerStats, S::CTFGameStats_FindPlayerStats(), void*,
 	void* rcx, CBasePlayer* pPlayer)
 {
+	DEBUG_RETURN(CTFGameStats_FindPlayerStats, rcx, pPlayer);
+
 	s_pCTFGameStats = rcx;
 	return CALL_ORIGINAL(rcx, pPlayer);
 }
diff --git a/Amalgam/src/Features/Visuals/Visuals.cpp b/Amalgam/src/Features/Visuals/Visuals.cpp
index 78a137a3..ddad9655 100644
--- a/Amalgam/src/Features/Visuals/Visuals.cpp
+++ b/Amalgam/src/Features/Visuals/Visuals.cpp
@@ -617,10 +617,7 @@ void CVisuals::DrawHitboxes(int iStore)
 MAKE_HOOK(CBaseAnimating_DrawServerHitboxes, S::CBaseAnimating_DrawServerHitboxes(), void,
 	void* rcx, float duration, bool monocolor)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CBaseAnimating_DrawServerHitboxes[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, duration, monocolor);
-#endif
+	DEBUG_RETURN(CBaseAnimating_DrawServerHitboxes, rcx, duration, monocolor);
 
 	if (s_bBoxesHeadOnly)
 		monocolor = false;
@@ -631,10 +628,7 @@ MAKE_HOOK(CBaseAnimating_DrawServerHitboxes, S::CBaseAnimating_DrawServerHitboxe
 MAKE_HOOK(NDebugOverlay_BoxAngles, S::NDebugOverlay_BoxAngles(), void,
 	Vector& origin, Vector& mins, Vector& maxs, QAngle& angles, int r, int g, int b, int a, float duration)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::NDebugOverlay_BoxAngles[DEFAULT_BIND])
-		return CALL_ORIGINAL(origin, mins, maxs, angles, r, g, b, a, duration);
-#endif
+	DEBUG_RETURN(NDebugOverlay_BoxAngles, origin, mins, maxs, angles, r, g, b, a, duration);
 
 	if (s_bBoxesHeadOnly)
 	{
diff --git a/Amalgam/src/Hooks/CAchievementMgr_CheckAchievementsEnabled.cpp b/Amalgam/src/Hooks/CAchievementMgr_CheckAchievementsEnabled.cpp
index 44123057..f3630252 100644
--- a/Amalgam/src/Hooks/CAchievementMgr_CheckAchievementsEnabled.cpp
+++ b/Amalgam/src/Hooks/CAchievementMgr_CheckAchievementsEnabled.cpp
@@ -5,10 +5,7 @@ MAKE_SIGNATURE(CAchievementMgr_CheckAchievementsEnabled, "client.dll", "40 53 48
 MAKE_HOOK(CAchievementMgr_CheckAchievementsEnabled, S::CAchievementMgr_CheckAchievementsEnabled(), bool,
 	void* rcx)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CAchievementMgr_CheckAchievementsEnabled[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx);
-#endif
+	DEBUG_RETURN(CAchievementMgr_CheckAchievementsEnabled, rcx);
 
 	return !I::EngineClient->IsPlayingDemo();
 }
\ No newline at end of file
diff --git a/Amalgam/src/Hooks/CAttributeManager_AttribHookValue.cpp b/Amalgam/src/Hooks/CAttributeManager_AttribHookValue.cpp
index ead3622b..42342008 100644
--- a/Amalgam/src/Hooks/CAttributeManager_AttribHookValue.cpp
+++ b/Amalgam/src/Hooks/CAttributeManager_AttribHookValue.cpp
@@ -11,10 +11,7 @@ static inline int ColorToInt(Color_t col)
 MAKE_HOOK(CAttributeManager_AttribHookInt, S::CAttributeManager_AttribHookInt(), int,
 	int value, const char* name, void* econent, void* buffer, bool isGlobalConstString)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CAttributeManager_AttribHookInt[DEFAULT_BIND])
-		return CALL_ORIGINAL(value, name, econent, buffer, isGlobalConstString);
-#endif
+	DEBUG_RETURN(CAttributeManager_AttribHookInt, value, name, econent, buffer, isGlobalConstString);
 
 	const auto dwRetAddr = uintptr_t(_ReturnAddress());
 	const auto dwDesired = S::CTFPlayer_FireEvent_AttribHookValue_Call();
diff --git a/Amalgam/src/Hooks/CBaseAnimating_Interpolate.cpp b/Amalgam/src/Hooks/CBaseAnimating_Interpolate.cpp
index ad9e3d67..98c06579 100644
--- a/Amalgam/src/Hooks/CBaseAnimating_Interpolate.cpp
+++ b/Amalgam/src/Hooks/CBaseAnimating_Interpolate.cpp
@@ -8,10 +8,7 @@ MAKE_SIGNATURE(CBaseAnimating_Interpolate, "client.dll", "48 8B C4 48 89 70 ? F3
 MAKE_HOOK(CBaseAnimating_Interpolate, S::CBaseAnimating_Interpolate(), bool,
 	void* rcx, float currentTime)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CBaseAnimating_Interpolate[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, currentTime);
-#endif
+	DEBUG_RETURN(CBaseAnimating_Interpolate, rcx, currentTime);
 
 	if (rcx == H::Entities.GetLocal() ? F::Ticks.m_bRecharge : Vars::Visuals::Removals::Interpolation.Value)
 		return true;
diff --git a/Amalgam/src/Hooks/CBaseAnimating_MaintainSequenceTransitions.cpp b/Amalgam/src/Hooks/CBaseAnimating_MaintainSequenceTransitions.cpp
index dd087f15..59d88fec 100644
--- a/Amalgam/src/Hooks/CBaseAnimating_MaintainSequenceTransitions.cpp
+++ b/Amalgam/src/Hooks/CBaseAnimating_MaintainSequenceTransitions.cpp
@@ -5,8 +5,5 @@ MAKE_SIGNATURE(CBaseAnimating_MaintainSequenceTransitions, "client.dll", "4C 89
 MAKE_HOOK(CBaseAnimating_MaintainSequenceTransitions, S::CBaseAnimating_MaintainSequenceTransitions(), void,
 	void* rcx, void* boneSetup, float flCycle, Vec3 pos[], Vector4D q[])
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CBaseAnimating_MaintainSequenceTransitions[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, boneSetup, flCycle, pos, q);
-#endif
+	DEBUG_RETURN(CBaseAnimating_MaintainSequenceTransitions, rcx, boneSetup, flCycle, pos, q);
 }
\ No newline at end of file
diff --git a/Amalgam/src/Hooks/CBaseAnimating_SetSequence.cpp b/Amalgam/src/Hooks/CBaseAnimating_SetSequence.cpp
index 46565d99..8644ff87 100644
--- a/Amalgam/src/Hooks/CBaseAnimating_SetSequence.cpp
+++ b/Amalgam/src/Hooks/CBaseAnimating_SetSequence.cpp
@@ -5,10 +5,7 @@ MAKE_SIGNATURE(CBaseAnimating_SetSequence, "client.dll", "40 53 48 83 EC ? 48 8B
 MAKE_HOOK(CBaseAnimating_SetSequence, S::CBaseAnimating_SetSequence(), void,
 	void* rcx, int nSequence)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CBaseAnimating_SetSequence[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, nSequence);
-#endif
+	DEBUG_RETURN(CBaseAnimating_SetSequence, rcx, nSequence);
 
 	auto pEntity = reinterpret_cast<CBaseAnimating*>(rcx);
 	if (pEntity->m_nSequence() != nSequence && !pEntity->m_bSequenceLoops())
diff --git a/Amalgam/src/Hooks/CBaseAnimating_SetupBones.cpp b/Amalgam/src/Hooks/CBaseAnimating_SetupBones.cpp
index ca0b2f86..bf61e92a 100644
--- a/Amalgam/src/Hooks/CBaseAnimating_SetupBones.cpp
+++ b/Amalgam/src/Hooks/CBaseAnimating_SetupBones.cpp
@@ -7,10 +7,7 @@ MAKE_SIGNATURE(CBaseAnimating_SetupBones, "client.dll", "48 8B C4 44 89 40 ? 48
 MAKE_HOOK(CBaseAnimating_SetupBones, S::CBaseAnimating_SetupBones(), bool,
 	void* rcx, matrix3x4* pBoneToWorldOut, int nMaxBones, int boneMask, float currentTime)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CBaseAnimating_SetupBones[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, pBoneToWorldOut, nMaxBones, boneMask, currentTime);
-#endif
+	DEBUG_RETURN(CBaseAnimating_SetupBones, rcx, pBoneToWorldOut, nMaxBones, boneMask, currentTime);
 
 	if (!Vars::Misc::Game::SetupBonesOptimization.Value || F::Backtrack.IsSettingUpBones())
 		return CALL_ORIGINAL(rcx, pBoneToWorldOut, nMaxBones, boneMask, currentTime);
diff --git a/Amalgam/src/Hooks/CBaseAnimating_UpdateClientSideAnimation.cpp b/Amalgam/src/Hooks/CBaseAnimating_UpdateClientSideAnimation.cpp
index 86d3804c..f88de70b 100644
--- a/Amalgam/src/Hooks/CBaseAnimating_UpdateClientSideAnimation.cpp
+++ b/Amalgam/src/Hooks/CBaseAnimating_UpdateClientSideAnimation.cpp
@@ -7,10 +7,7 @@ MAKE_SIGNATURE(CBaseAnimating_UpdateClientSideAnimation, "client.dll", "48 89 5C
 MAKE_HOOK(CBaseAnimating_UpdateClientSideAnimation, S::CBaseAnimating_UpdateClientSideAnimation(), void,
 	void* rcx)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CBaseAnimating_UpdateClientSideAnimation[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx);
-#endif
+	DEBUG_RETURN(CBaseAnimating_UpdateClientSideAnimation, rcx);
 
 	auto pLocal = H::Entities.GetLocal();
 	auto pPlayer = reinterpret_cast<CTFPlayer*>(rcx);
diff --git a/Amalgam/src/Hooks/CBaseEntity_BaseInterpolatePart1.cpp b/Amalgam/src/Hooks/CBaseEntity_BaseInterpolatePart1.cpp
index bbf259f9..6bd45edf 100644
--- a/Amalgam/src/Hooks/CBaseEntity_BaseInterpolatePart1.cpp
+++ b/Amalgam/src/Hooks/CBaseEntity_BaseInterpolatePart1.cpp
@@ -7,10 +7,7 @@ MAKE_SIGNATURE(CBaseEntity_BaseInterpolatePart1, "client.dll", "48 89 5C 24 ? 56
 MAKE_HOOK(CBaseEntity_BaseInterpolatePart1, S::CBaseEntity_BaseInterpolatePart1(), int,
 	void* rcx, float& currentTime, Vector& oldOrigin, QAngle& oldAngles, Vector& oldVel, int& bNoMoreChanges)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CBaseEntity_BaseInterpolatePart1[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, currentTime, oldOrigin, oldAngles, oldVel, bNoMoreChanges);
-#endif
+	DEBUG_RETURN(CBaseEntity_BaseInterpolatePart1, rcx, currentTime, oldOrigin, oldAngles, oldVel, bNoMoreChanges);
 
 	auto pEntity = reinterpret_cast<CBaseEntity*>(rcx);
 	if (pEntity && pEntity->GetClassID() == ETFClassID::CTFViewModel && F::Ticks.m_bRecharge)
diff --git a/Amalgam/src/Hooks/CBaseEntity_EstimateAbsVelocity.cpp b/Amalgam/src/Hooks/CBaseEntity_EstimateAbsVelocity.cpp
index 53e6710a..09a7b29b 100644
--- a/Amalgam/src/Hooks/CBaseEntity_EstimateAbsVelocity.cpp
+++ b/Amalgam/src/Hooks/CBaseEntity_EstimateAbsVelocity.cpp
@@ -6,10 +6,7 @@
 MAKE_HOOK(CBaseEntity_EstimateAbsVelocity, S::CBaseEntity_EstimateAbsVelocity(), void,
 	void* rcx, Vector& vel)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CBaseEntity_EstimateAbsVelocity[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, vel);
-#endif
+	DEBUG_RETURN(CBaseEntity_EstimateAbsVelocity, rcx, vel);
 
 	auto pPlayer = reinterpret_cast<CTFPlayer*>(rcx);
 	if (!pPlayer->IsPlayer())
diff --git a/Amalgam/src/Hooks/CBaseEntity_ResetLatched.cpp b/Amalgam/src/Hooks/CBaseEntity_ResetLatched.cpp
index 61211f0d..f80e4f86 100644
--- a/Amalgam/src/Hooks/CBaseEntity_ResetLatched.cpp
+++ b/Amalgam/src/Hooks/CBaseEntity_ResetLatched.cpp
@@ -5,10 +5,7 @@ MAKE_SIGNATURE(CBaseEntity_ResetLatched, "client.dll", "40 56 48 83 EC ? 48 8B 0
 MAKE_HOOK(CBaseEntity_ResetLatched, S::CBaseEntity_ResetLatched(), void,
 	void* rcx)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CBaseEntity_ResetLatched[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx);
-#endif
+	DEBUG_RETURN(CBaseEntity_ResetLatched, rcx);
 
 	if (rcx == H::Entities.GetLocal())
 		return;
diff --git a/Amalgam/src/Hooks/CBaseEntity_SetAbsVelocity.cpp b/Amalgam/src/Hooks/CBaseEntity_SetAbsVelocity.cpp
index 49f89d7c..6599fc8b 100644
--- a/Amalgam/src/Hooks/CBaseEntity_SetAbsVelocity.cpp
+++ b/Amalgam/src/Hooks/CBaseEntity_SetAbsVelocity.cpp
@@ -57,10 +57,7 @@ MAKE_SIGNATURE(CBasePlayer_PostDataUpdate_SetAbsVelocity_Call, "client.dll", "0F
 MAKE_HOOK(CBaseEntity_SetAbsVelocity, S::CBaseEntity_SetAbsVelocity(), void,
 	void* rcx, const Vec3& vecAbsVelocity)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CBaseEntity_SetAbsVelocity[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, vecAbsVelocity);
-#endif
+	DEBUG_RETURN(CBaseEntity_SetAbsVelocity, rcx, vecAbsVelocity);
 
 	const auto dwRetAddr = uintptr_t(_ReturnAddress());
 	const auto dwDesired = S::CBasePlayer_PostDataUpdate_SetAbsVelocity_Call();
diff --git a/Amalgam/src/Hooks/CBaseEntity_WorldSpaceCenter.cpp b/Amalgam/src/Hooks/CBaseEntity_WorldSpaceCenter.cpp
index 5fc4323e..3c50fbc0 100644
--- a/Amalgam/src/Hooks/CBaseEntity_WorldSpaceCenter.cpp
+++ b/Amalgam/src/Hooks/CBaseEntity_WorldSpaceCenter.cpp
@@ -7,10 +7,7 @@ MAKE_SIGNATURE(MainViewOrigin, "client.dll", "48 8D 05 ? ? ? ? C3 CC CC CC CC CC
 MAKE_HOOK(CBaseEntity_WorldSpaceCenter, S::CBaseEntity_WorldSpaceCenter(), const Vec3&,
 	void* rcx)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CBaseEntity_WorldSpaceCenter[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx);
-#endif
+	DEBUG_RETURN(CBaseEntity_WorldSpaceCenter, rcx);
 
 	const auto dwRetAddr = uintptr_t(_ReturnAddress());
 	const auto dwDesired = S::CDamageAccountPanel_DisplayDamageFeedback_WorldSpaceCenter_Call();
diff --git a/Amalgam/src/Hooks/CBaseHudChatLine_InsertAndColorizeText.cpp b/Amalgam/src/Hooks/CBaseHudChatLine_InsertAndColorizeText.cpp
index 809e2b22..7fc0d874 100644
--- a/Amalgam/src/Hooks/CBaseHudChatLine_InsertAndColorizeText.cpp
+++ b/Amalgam/src/Hooks/CBaseHudChatLine_InsertAndColorizeText.cpp
@@ -7,10 +7,7 @@ MAKE_SIGNATURE(CBaseHudChatLine_InsertAndColorizeText, "client.dll", "44 89 44 2
 MAKE_HOOK(CBaseHudChatLine_InsertAndColorizeText, S::CBaseHudChatLine_InsertAndColorizeText(), void,
 	void* rcx, wchar_t* buf, int clientIndex)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CBaseHudChatLine_InsertAndColorizeText[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, buf, clientIndex);
-#endif
+	DEBUG_RETURN(CBaseHudChatLine_InsertAndColorizeText, rcx, buf, clientIndex);
 
 	auto pResource = H::Entities.GetResource();
 	if (!pResource || !pResource->IsValid(clientIndex))
diff --git a/Amalgam/src/Hooks/CBasePlayer_CalcObserverView.cpp b/Amalgam/src/Hooks/CBasePlayer_CalcObserverView.cpp
index ad056a50..9c58014e 100644
--- a/Amalgam/src/Hooks/CBasePlayer_CalcObserverView.cpp
+++ b/Amalgam/src/Hooks/CBasePlayer_CalcObserverView.cpp
@@ -7,10 +7,7 @@ MAKE_SIGNATURE(CBasePlayer_CalcObserverView, "client.dll", "48 89 5C 24 ? 48 89
 MAKE_HOOK(CBasePlayer_CalcObserverView, S::CBasePlayer_CalcObserverView(), void,
 	void* rcx, Vector& eyeOrigin, QAngle& eyeAngles, float& fov)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CBasePlayer_CalcObserverView[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, eyeOrigin, eyeAngles, fov);
-#endif
+	DEBUG_RETURN(CBasePlayer_CalcObserverView, rcx, eyeOrigin, eyeAngles, fov);
 
 	if (!F::Spectate.HasTarget())
 		return CALL_ORIGINAL(rcx, eyeOrigin, eyeAngles, fov);
diff --git a/Amalgam/src/Hooks/CBasePlayer_CalcView.cpp b/Amalgam/src/Hooks/CBasePlayer_CalcView.cpp
index 64681943..363a181c 100644
--- a/Amalgam/src/Hooks/CBasePlayer_CalcView.cpp
+++ b/Amalgam/src/Hooks/CBasePlayer_CalcView.cpp
@@ -7,10 +7,7 @@ MAKE_SIGNATURE(CBasePlayer_CalcView, "client.dll", "40 57 48 83 EC ? 44 8B 91",
 MAKE_HOOK(CBasePlayer_CalcView, S::CBasePlayer_CalcView(), void,
 	void* rcx, Vector& eyeOrigin, QAngle& eyeAngles, float& zNear, float& zFar, float& fov)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CBasePlayer_CalcView[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, eyeOrigin, eyeAngles, zNear, zFar, fov);
-#endif
+	DEBUG_RETURN(CBasePlayer_CalcView, rcx, eyeOrigin, eyeAngles, zNear, zFar, fov);
 
 	if (!Vars::Visuals::Removals::ViewPunch.Value && !F::Spectate.HasTarget())
 		return CALL_ORIGINAL(rcx, eyeOrigin, eyeAngles, zNear, zFar, fov);
diff --git a/Amalgam/src/Hooks/CBasePlayer_CalcViewModelView.cpp b/Amalgam/src/Hooks/CBasePlayer_CalcViewModelView.cpp
index 675f8662..cfd24ac4 100644
--- a/Amalgam/src/Hooks/CBasePlayer_CalcViewModelView.cpp
+++ b/Amalgam/src/Hooks/CBasePlayer_CalcViewModelView.cpp
@@ -6,10 +6,7 @@ MAKE_SIGNATURE(CBasePlayer_CalcViewModelView, "client.dll", "48 89 5C 24 ? 48 89
 MAKE_HOOK(CBaseViewModel_CalcViewModelView, S::CBaseViewModel_CalcViewModelView(), void,
 	void* rcx, CBasePlayer* owner, /*const*/ Vector& eyePosition, /*const*/ QAngle& eyeAngles)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CBaseViewModel_CalcViewModelView[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, owner, eyePosition, eyeAngles);
-#endif
+	DEBUG_RETURN(CBaseViewModel_CalcViewModelView, rcx, owner, eyePosition, eyeAngles);
 
 	Vec3 vOffset = { Vars::Visuals::Viewmodel::OffsetX.Value, Vars::Visuals::Viewmodel::OffsetY.Value, Vars::Visuals::Viewmodel::OffsetZ.Value };
 	Vec3 vAngles = { Vars::Visuals::Viewmodel::Pitch.Value, Vars::Visuals::Viewmodel::Yaw.Value, Vars::Visuals::Viewmodel::Roll.Value };
@@ -50,10 +47,7 @@ MAKE_HOOK(CBaseViewModel_CalcViewModelView, S::CBaseViewModel_CalcViewModelView(
 MAKE_HOOK(CBasePlayer_CalcViewModelView, S::CBasePlayer_CalcViewModelView(), void,
 	void* rcx, /*const*/ Vector& eyeOrigin, /*const*/ QAngle& eyeAngles)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CBasePlayer_CalcViewModelView[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, eyeOrigin, eyeAngles);
-#endif
+	DEBUG_RETURN(CBasePlayer_CalcViewModelView, rcx, eyeOrigin, eyeAngles);
 
 	Vector vOldEyeOrigin = eyeOrigin, vOldEyeAngles = eyeAngles;
 	CALL_ORIGINAL(rcx, eyeOrigin, eyeAngles);
diff --git a/Amalgam/src/Hooks/CBasePlayer_ItemPostFrame.cpp b/Amalgam/src/Hooks/CBasePlayer_ItemPostFrame.cpp
index 5477dd43..f91a2556 100644
--- a/Amalgam/src/Hooks/CBasePlayer_ItemPostFrame.cpp
+++ b/Amalgam/src/Hooks/CBasePlayer_ItemPostFrame.cpp
@@ -69,10 +69,7 @@ typedef enum
 MAKE_HOOK(CBasePlayer_ItemPostFrame, S::CBasePlayer_ItemPostFrame(), void,
 	void* rcx)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CBasePlayer_ItemPostFrame[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx);
-#endif
+	DEBUG_RETURN(CBasePlayer_ItemPostFrame, rcx);
 
 	auto pLocal = reinterpret_cast<CTFPlayer*>(rcx);
 	auto pWeapon = H::Entities.GetWeapon();
diff --git a/Amalgam/src/Hooks/CBaseViewModel_ShouldFlipViewModel.cpp b/Amalgam/src/Hooks/CBaseViewModel_ShouldFlipViewModel.cpp
index 0cdfbea2..351e5bb9 100644
--- a/Amalgam/src/Hooks/CBaseViewModel_ShouldFlipViewModel.cpp
+++ b/Amalgam/src/Hooks/CBaseViewModel_ShouldFlipViewModel.cpp
@@ -5,10 +5,7 @@ MAKE_SIGNATURE(CBaseViewModel_ShouldFlipViewModel, "client.dll", "40 57 48 83 EC
 MAKE_HOOK(CBaseViewModel_ShouldFlipViewModel, S::CBaseViewModel_ShouldFlipViewModel(), bool,
 	void* rcx)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CBaseViewModel_ShouldFlipViewModel[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx);
-#endif
+	DEBUG_RETURN(CBaseViewModel_ShouldFlipViewModel, rcx);
 
 	return G::FlipViewmodels = CALL_ORIGINAL(rcx);
 }
\ No newline at end of file
diff --git a/Amalgam/src/Hooks/CClientModeShared_DoPostScreenSpaceEffects.cpp b/Amalgam/src/Hooks/CClientModeShared_DoPostScreenSpaceEffects.cpp
index 54827235..e089c724 100644
--- a/Amalgam/src/Hooks/CClientModeShared_DoPostScreenSpaceEffects.cpp
+++ b/Amalgam/src/Hooks/CClientModeShared_DoPostScreenSpaceEffects.cpp
@@ -9,10 +9,7 @@
 MAKE_HOOK(CClientModeShared_DoPostScreenSpaceEffects, U::Memory.GetVirtual(I::ClientModeShared, 39), bool,
 	void* rcx, const CViewSetup* pSetup)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CClientModeShared_DoPostScreenSpaceEffects[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, pSetup);
-#endif
+	DEBUG_RETURN(CClientModeShared_DoPostScreenSpaceEffects, rcx, pSetup);
 
 	if (SDK::CleanScreenshot())
 		return CALL_ORIGINAL(rcx, pSetup);
diff --git a/Amalgam/src/Hooks/CClientModeShared_OverrideView.cpp b/Amalgam/src/Hooks/CClientModeShared_OverrideView.cpp
index fb7a4b3f..3c6b5310 100644
--- a/Amalgam/src/Hooks/CClientModeShared_OverrideView.cpp
+++ b/Amalgam/src/Hooks/CClientModeShared_OverrideView.cpp
@@ -5,10 +5,7 @@
 MAKE_HOOK(CClientModeShared_OverrideView, U::Memory.GetVirtual(I::ClientModeShared, 16), void,
 	void* rcx, CViewSetup* pView)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CClientModeShared_OverrideView[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, pView);
-#endif
+	DEBUG_RETURN(CClientModeShared_OverrideView, rcx, pView);
 
 	CALL_ORIGINAL(rcx, pView);
 
diff --git a/Amalgam/src/Hooks/CClientModeShared_ShouldDrawViewModel.cpp b/Amalgam/src/Hooks/CClientModeShared_ShouldDrawViewModel.cpp
index 9df29c97..d9849ee7 100644
--- a/Amalgam/src/Hooks/CClientModeShared_ShouldDrawViewModel.cpp
+++ b/Amalgam/src/Hooks/CClientModeShared_ShouldDrawViewModel.cpp
@@ -5,10 +5,7 @@
 MAKE_HOOK(CClientModeShared_ShouldDrawViewModel, U::Memory.GetVirtual(I::ClientModeShared, 24), bool,
 	void* rcx)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CClientModeShared_ShouldDrawViewModel[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx);
-#endif
+	DEBUG_RETURN(CClientModeShared_ShouldDrawViewModel, rcx);
 
 	if (Vars::Visuals::UI::ZoomFieldOfView.Value)
 	{
diff --git a/Amalgam/src/Hooks/CClientState_GetClientInterpAmount.cpp b/Amalgam/src/Hooks/CClientState_GetClientInterpAmount.cpp
index ba79c6ca..a7543d37 100644
--- a/Amalgam/src/Hooks/CClientState_GetClientInterpAmount.cpp
+++ b/Amalgam/src/Hooks/CClientState_GetClientInterpAmount.cpp
@@ -5,10 +5,7 @@ MAKE_SIGNATURE(CClientState_GetClientInterpAmount, "engine.dll", "48 83 EC ? 48
 MAKE_HOOK(CClientState_GetClientInterpAmount, S::CClientState_GetClientInterpAmount(), float,
 	CClientState* rcx)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CClientState_GetClientInterpAmount[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx);
-#endif
+	DEBUG_RETURN(CClientState_GetClientInterpAmount, rcx);
 
 	G::Lerp = CALL_ORIGINAL(rcx);
 	return 0.f;
diff --git a/Amalgam/src/Hooks/CClientState_ProcessFixAngle.cpp b/Amalgam/src/Hooks/CClientState_ProcessFixAngle.cpp
index cbf74eea..50ba7e20 100644
--- a/Amalgam/src/Hooks/CClientState_ProcessFixAngle.cpp
+++ b/Amalgam/src/Hooks/CClientState_ProcessFixAngle.cpp
@@ -7,10 +7,7 @@ MAKE_SIGNATURE(CClientState_ProcessFixAngle, "engine.dll", "40 53 48 83 EC ? F3
 MAKE_HOOK(CClientState_ProcessFixAngle, S::CClientState_ProcessFixAngle(), bool,
 	CClientState* rcx, SVC_FixAngle* msg)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CClientState_ProcessFixAngle[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, msg);
-#endif
+	DEBUG_RETURN(CClientState_ProcessFixAngle, rcx, msg);
 
 	if (Vars::Visuals::Removals::AngleForcing.Value)
 		return false;
diff --git a/Amalgam/src/Hooks/CHLClient_CreateMove.cpp b/Amalgam/src/Hooks/CHLClient_CreateMove.cpp
index bf3cafa7..cac54555 100644
--- a/Amalgam/src/Hooks/CHLClient_CreateMove.cpp
+++ b/Amalgam/src/Hooks/CHLClient_CreateMove.cpp
@@ -231,10 +231,7 @@ static inline void AntiCheatCompatibility(CUserCmd* pCmd, bool* pSendPacket)
 MAKE_HOOK(CHLClient_CreateMove, U::Memory.GetVirtual(I::Client, 21), void,
 	void* rcx, int sequence_number, float input_sample_frametime, bool active)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CHLClient_CreateMove[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, sequence_number, input_sample_frametime, active);
-#endif
+	DEBUG_RETURN(CHLClient_CreateMove, rcx, sequence_number, input_sample_frametime, active);
 
 	CALL_ORIGINAL(rcx, sequence_number, input_sample_frametime, active);
 
diff --git a/Amalgam/src/Hooks/CHLClient_DispatchUserMessage.cpp b/Amalgam/src/Hooks/CHLClient_DispatchUserMessage.cpp
index 48637047..21517809 100644
--- a/Amalgam/src/Hooks/CHLClient_DispatchUserMessage.cpp
+++ b/Amalgam/src/Hooks/CHLClient_DispatchUserMessage.cpp
@@ -15,10 +15,7 @@
 MAKE_HOOK(CHLClient_DispatchUserMessage, U::Memory.GetVirtual(I::Client, 36), bool,
 	void* rcx, UserMessageType type, bf_read& msgData)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CHLClient_DispatchUserMessage[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, type, msgData);
-#endif
+	DEBUG_RETURN(CHLClient_DispatchUserMessage, rcx, type, msgData);
 
 	auto bufData = reinterpret_cast<const char*>(msgData.m_pData);
 	msgData.SetAssertOnOverflow(false);
diff --git a/Amalgam/src/Hooks/CHLClient_FrameStageNotify.cpp b/Amalgam/src/Hooks/CHLClient_FrameStageNotify.cpp
index ed8b0e93..304fa2ea 100644
--- a/Amalgam/src/Hooks/CHLClient_FrameStageNotify.cpp
+++ b/Amalgam/src/Hooks/CHLClient_FrameStageNotify.cpp
@@ -18,10 +18,7 @@
 MAKE_HOOK(CHLClient_FrameStageNotify, U::Memory.GetVirtual(I::Client, 35), void,
 	void* rcx, ClientFrameStage_t curStage)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CHLClient_FrameStageNotify[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, curStage);
-#endif
+	DEBUG_RETURN(CHLClient_FrameStageNotify, rcx, curStage);
 
 	if (G::Unload)
 		return CALL_ORIGINAL(rcx, curStage);
diff --git a/Amalgam/src/Hooks/CHLClient_LevelShutdown.cpp b/Amalgam/src/Hooks/CHLClient_LevelShutdown.cpp
index 15d9cf1e..73054247 100644
--- a/Amalgam/src/Hooks/CHLClient_LevelShutdown.cpp
+++ b/Amalgam/src/Hooks/CHLClient_LevelShutdown.cpp
@@ -6,10 +6,7 @@
 MAKE_HOOK(CHLClient_LevelShutdown, U::Memory.GetVirtual(I::Client, 7), void,
 	void* rcx)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CHLClient_LevelShutdown[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx);
-#endif
+	DEBUG_RETURN(CHLClient_LevelShutdown, rcx);
 
 	H::Entities.Clear(true);
 	F::EnginePrediction.Unload();
diff --git a/Amalgam/src/Hooks/CHLTVCamera_CalcView.cpp b/Amalgam/src/Hooks/CHLTVCamera_CalcView.cpp
index 717b7523..32c97517 100644
--- a/Amalgam/src/Hooks/CHLTVCamera_CalcView.cpp
+++ b/Amalgam/src/Hooks/CHLTVCamera_CalcView.cpp
@@ -9,10 +9,7 @@ MAKE_SIGNATURE(CHLTVCamera_GetMode, "client.dll", "40 53 48 83 EC ? 48 8B D9 8B
 MAKE_HOOK(CHLTVCamera_CalcView, S::CHLTVCamera_CalcView(), void,
 	void* rcx, Vector& origin, QAngle& angles, float& fov)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CHLTVCamera_CalcView[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, origin, angles, fov);
-#endif
+	DEBUG_RETURN(CHLTVCamera_CalcView, rcx, origin, angles, fov);
 
 	auto pHLTVCamera = reinterpret_cast<CHLTVCamera*>(rcx);
 
@@ -37,10 +34,7 @@ MAKE_HOOK(CHLTVCamera_CalcView, S::CHLTVCamera_CalcView(), void,
 MAKE_HOOK(CHLTVCamera_GetPrimaryTarget, S::CHLTVCamera_GetPrimaryTarget(), CBaseEntity*,
 	void* rcx)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CHLTVCamera_GetPrimaryTarget[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx);
-#endif
+	DEBUG_RETURN(CHLTVCamera_GetPrimaryTarget, rcx);
 
 	auto pHLTVCamera = reinterpret_cast<CHLTVCamera*>(rcx);
 
@@ -53,10 +47,7 @@ MAKE_HOOK(CHLTVCamera_GetPrimaryTarget, S::CHLTVCamera_GetPrimaryTarget(), CBase
 MAKE_HOOK(CHLTVCamera_GetMode, S::CHLTVCamera_GetMode(), int,
 	void* rcx)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CHLTVCamera_GetMode[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx);
-#endif
+	DEBUG_RETURN(CHLTVCamera_GetMode, rcx);
 
 	auto pHLTVCamera = reinterpret_cast<CHLTVCamera*>(rcx);
 
diff --git a/Amalgam/src/Hooks/CHudCrosshair_GetDrawPosition.cpp b/Amalgam/src/Hooks/CHudCrosshair_GetDrawPosition.cpp
index 192f4d9b..e54b0f30 100644
--- a/Amalgam/src/Hooks/CHudCrosshair_GetDrawPosition.cpp
+++ b/Amalgam/src/Hooks/CHudCrosshair_GetDrawPosition.cpp
@@ -5,10 +5,7 @@ MAKE_SIGNATURE(CHudCrosshair_GetDrawPosition, "client.dll", "48 8B C4 55 53 56 4
 MAKE_HOOK(CHudCrosshair_GetDrawPosition, S::CHudCrosshair_GetDrawPosition(), void,
 	float* pX, float* pY, bool* pbBehindCamera, Vec3 angleCrosshairOffset)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CHudCrosshair_GetDrawPosition[DEFAULT_BIND])
-		return CALL_ORIGINAL(pX, pY, pbBehindCamera, angleCrosshairOffset);
-#endif
+	DEBUG_RETURN(CHudCrosshair_GetDrawPosition, pX, pY, pbBehindCamera, angleCrosshairOffset);
 
 	if (!Vars::Visuals::Viewmodel::CrosshairAim.Value && !Vars::Visuals::Thirdperson::Crosshair.Value || SDK::CleanScreenshot())
 		return CALL_ORIGINAL(pX, pY, pbBehindCamera, angleCrosshairOffset);
diff --git a/Amalgam/src/Hooks/CInput_GetUserCmd.cpp b/Amalgam/src/Hooks/CInput_GetUserCmd.cpp
index 7116017b..f8f0bd7d 100644
--- a/Amalgam/src/Hooks/CInput_GetUserCmd.cpp
+++ b/Amalgam/src/Hooks/CInput_GetUserCmd.cpp
@@ -3,10 +3,7 @@
 MAKE_HOOK(CInput_GetUserCmd, U::Memory.GetVirtual(I::Input, 8), CUserCmd*,
 	void* rcx, int sequence_number)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CInput_GetUserCmd[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, sequence_number);
-#endif
+	DEBUG_RETURN(CInput_GetUserCmd, rcx, sequence_number);
 
 	return &I::Input->m_pCommands[sequence_number % MULTIPLAYER_BACKUP];
 }
\ No newline at end of file
diff --git a/Amalgam/src/Hooks/CInput_ValidateUserCmd.cpp b/Amalgam/src/Hooks/CInput_ValidateUserCmd.cpp
index 74df4e96..e0f9f922 100644
--- a/Amalgam/src/Hooks/CInput_ValidateUserCmd.cpp
+++ b/Amalgam/src/Hooks/CInput_ValidateUserCmd.cpp
@@ -5,8 +5,5 @@ MAKE_SIGNATURE(CInput_ValidateUserCmd, "client.dll", "48 89 5C 24 ? 48 89 74 24
 MAKE_HOOK(CInput_ValidateUserCmd, S::CInput_ValidateUserCmd(), void,
 	void* rcx, CUserCmd* usercmd, int sequence_number)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CInput_ValidateUserCmd[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, usercmd, sequence_number);
-#endif
+	DEBUG_RETURN(CInput_ValidateUserCmd, rcx, usercmd, sequence_number);
 }
\ No newline at end of file
diff --git a/Amalgam/src/Hooks/CInventoryManager_ShowItemsPickedUp.cpp b/Amalgam/src/Hooks/CInventoryManager_ShowItemsPickedUp.cpp
index 7cab59fc..9f57cef2 100644
--- a/Amalgam/src/Hooks/CInventoryManager_ShowItemsPickedUp.cpp
+++ b/Amalgam/src/Hooks/CInventoryManager_ShowItemsPickedUp.cpp
@@ -5,10 +5,7 @@ MAKE_SIGNATURE(CInventoryManager_ShowItemsPickedUp, "client.dll", "44 88 4C 24 ?
 MAKE_HOOK(CInventoryManager_ShowItemsPickedUp, S::CInventoryManager_ShowItemsPickedUp(), bool,
 	void* rcx, bool bForce, bool bReturnToGame, bool bNoPanel)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CInventoryManager_ShowItemsPickedUp[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, bForce, bReturnToGame, bNoPanel);
-#endif
+	DEBUG_RETURN(CInventoryManager_ShowItemsPickedUp, rcx, bForce, bReturnToGame, bNoPanel);
 
 	if (Vars::Misc::Automation::AcceptItemDrops.Value)
 	{
diff --git a/Amalgam/src/Hooks/CL_CheckForPureServerWhitelist.cpp b/Amalgam/src/Hooks/CL_CheckForPureServerWhitelist.cpp
index aef6baff..f4ef369e 100644
--- a/Amalgam/src/Hooks/CL_CheckForPureServerWhitelist.cpp
+++ b/Amalgam/src/Hooks/CL_CheckForPureServerWhitelist.cpp
@@ -5,10 +5,7 @@ MAKE_SIGNATURE(CL_CheckForPureServerWhitelist, "engine.dll", "40 56 48 83 EC ? 8
 MAKE_HOOK(CL_CheckForPureServerWhitelist, S::CL_CheckForPureServerWhitelist(), void,
 	void **pFilesToReload)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CL_CheckForPureServerWhitelist[DEFAULT_BIND])
-		return CALL_ORIGINAL(pFilesToReload);
-#endif
+	DEBUG_RETURN(CL_CheckForPureServerWhitelist, pFilesToReload);
 
 	if (Vars::Misc::Exploits::PureBypass.Value)
 		return;
diff --git a/Amalgam/src/Hooks/CL_Move.cpp b/Amalgam/src/Hooks/CL_Move.cpp
index 3a9bfb57..a06aff32 100644
--- a/Amalgam/src/Hooks/CL_Move.cpp
+++ b/Amalgam/src/Hooks/CL_Move.cpp
@@ -14,10 +14,7 @@ MAKE_SIGNATURE(CL_Move, "engine.dll", "40 55 53 48 8D AC 24 ? ? ? ? B8 ? ? ? ? E
 MAKE_HOOK(CL_Move, S::CL_Move(), void,
 	float accumulated_extra_samples, bool bFinalTick)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CL_Move[DEFAULT_BIND])
-		return CALL_ORIGINAL(accumulated_extra_samples, bFinalTick);
-#endif
+	DEBUG_RETURN(CL_Move, accumulated_extra_samples, bFinalTick);
 
 	if (G::Unload)
 		return CALL_ORIGINAL(accumulated_extra_samples, bFinalTick);
diff --git a/Amalgam/src/Hooks/CL_ProcessPacketEntities.cpp b/Amalgam/src/Hooks/CL_ProcessPacketEntities.cpp
index 89e75d3c..8c3583b4 100644
--- a/Amalgam/src/Hooks/CL_ProcessPacketEntities.cpp
+++ b/Amalgam/src/Hooks/CL_ProcessPacketEntities.cpp
@@ -12,10 +12,7 @@ struct CriticalStorage_t
 MAKE_HOOK(CL_ProcessPacketEntities, S::CL_ProcessPacketEntities(), bool,
 	SVC_PacketEntities* entmsg)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CL_ProcessPacketEntities[DEFAULT_BIND])
-		return CALL_ORIGINAL(entmsg);
-#endif
+	DEBUG_RETURN(CL_ProcessPacketEntities, entmsg);
 
 	if (entmsg->m_bIsDelta) // we won't need to restore
 		return CALL_ORIGINAL(entmsg);
diff --git a/Amalgam/src/Hooks/CL_ReadPackets.cpp b/Amalgam/src/Hooks/CL_ReadPackets.cpp
index 5ec3fc68..f32c7d09 100644
--- a/Amalgam/src/Hooks/CL_ReadPackets.cpp
+++ b/Amalgam/src/Hooks/CL_ReadPackets.cpp
@@ -7,10 +7,7 @@ MAKE_SIGNATURE(CL_ReadPackets, "engine.dll", "4C 8B DC 49 89 5B ? 55 56 57 41 54
 MAKE_HOOK(CL_ReadPackets, S::CL_ReadPackets(), void,
 	bool bFinalTick)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CL_ReadPackets[DEFAULT_BIND])
-		return CALL_ORIGINAL(bFinalTick);
-#endif
+	DEBUG_RETURN(CL_ReadPackets, bFinalTick);
 
 	if (F::NetworkFix.ShouldReadPackets())
 		CALL_ORIGINAL(bFinalTick);
diff --git a/Amalgam/src/Hooks/CMatchInviteNotification_OnTick.cpp b/Amalgam/src/Hooks/CMatchInviteNotification_OnTick.cpp
index ccad305e..f0dd0a0d 100644
--- a/Amalgam/src/Hooks/CMatchInviteNotification_OnTick.cpp
+++ b/Amalgam/src/Hooks/CMatchInviteNotification_OnTick.cpp
@@ -5,10 +5,7 @@ MAKE_SIGNATURE(CMatchInviteNotification_OnTick, "client.dll", "40 53 48 83 EC ?
 MAKE_HOOK(CMatchInviteNotification_OnTick, S::CMatchInviteNotification_OnTick(), void,
 	void* rcx)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CMatchInviteNotification_OnTick[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx);
-#endif
+	DEBUG_RETURN(CMatchInviteNotification_OnTick, rcx);
 
 	if (Vars::Misc::Queueing::FreezeQueue.Value)
 		*reinterpret_cast<double*>(uintptr_t(rcx) + 616) = 0.0;
diff --git a/Amalgam/src/Hooks/CMaterial_Uncache.cpp b/Amalgam/src/Hooks/CMaterial_Uncache.cpp
index b71044b3..c483710b 100644
--- a/Amalgam/src/Hooks/CMaterial_Uncache.cpp
+++ b/Amalgam/src/Hooks/CMaterial_Uncache.cpp
@@ -7,10 +7,7 @@ MAKE_SIGNATURE(CMaterial_Uncache, "materialsystem.dll", "48 89 5C 24 ? 48 89 6C
 MAKE_HOOK(CMaterial_Uncache, S::CMaterial_Uncache(), void,
 	IMaterial* rcx, bool bPreserveVars)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CMaterial_Uncache[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, bPreserveVars);
-#endif
+	DEBUG_RETURN(CMaterial_Uncache, rcx, bPreserveVars);
 
 	if (F::Materials.m_mMatList.contains(rcx))
 		return;
diff --git a/Amalgam/src/Hooks/CNetChannel_SendDatagram.cpp b/Amalgam/src/Hooks/CNetChannel_SendDatagram.cpp
index c87983d1..289d903e 100644
--- a/Amalgam/src/Hooks/CNetChannel_SendDatagram.cpp
+++ b/Amalgam/src/Hooks/CNetChannel_SendDatagram.cpp
@@ -7,10 +7,7 @@ MAKE_SIGNATURE(CNetChannel_SendDatagram, "engine.dll", "40 55 57 41 56 48 8D AC
 MAKE_HOOK(CNetChannel_SendDatagram, S::CNetChannel_SendDatagram(), int,
 	CNetChannel* pNetChan, bf_write* datagram)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CNetChannel_SendDatagram[DEFAULT_BIND])
-		return CALL_ORIGINAL(pNetChan, datagram);
-#endif
+	DEBUG_RETURN(CNetChannel_SendDatagram, pNetChan, datagram);
 
 	if (datagram)
 		return CALL_ORIGINAL(pNetChan, datagram);
diff --git a/Amalgam/src/Hooks/CNetChannel_SendNetMsg.cpp b/Amalgam/src/Hooks/CNetChannel_SendNetMsg.cpp
index 4591d308..4d0d300d 100644
--- a/Amalgam/src/Hooks/CNetChannel_SendNetMsg.cpp
+++ b/Amalgam/src/Hooks/CNetChannel_SendNetMsg.cpp
@@ -9,10 +9,7 @@ MAKE_SIGNATURE(CNetChannel_SendNetMsg, "engine.dll", "48 89 5C 24 ? 48 89 74 24
 MAKE_HOOK(CNetChannel_SendNetMsg, S::CNetChannel_SendNetMsg(), bool,
 	CNetChannel* pNetChan, INetMessage& msg, bool bForceReliable, bool bVoice)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CNetChannel_SendNetMsg[DEFAULT_BIND])
-		return CALL_ORIGINAL(pNetChan, msg, bForceReliable, bVoice);
-#endif
+	DEBUG_RETURN(CNetChannel_SendNetMsg, pNetChan, msg, bForceReliable, bVoice);
 
 	switch (msg.GetType())
 	{
diff --git a/Amalgam/src/Hooks/COPRenderSprites_Render.cpp b/Amalgam/src/Hooks/COPRenderSprites_Render.cpp
index b70c7786..000e1648 100644
--- a/Amalgam/src/Hooks/COPRenderSprites_Render.cpp
+++ b/Amalgam/src/Hooks/COPRenderSprites_Render.cpp
@@ -73,10 +73,7 @@ struct ParticleRenderData_t
 MAKE_HOOK(COPRenderSprites_Render, S::COPRenderSprites_Render(), void,
     void* rcx, IMatRenderContext* pRenderContext, CParticleCollection* pParticles, void* pContext)
 {
-#ifdef DEBUG_HOOKS
-    if (!Vars::Hooks::COPRenderSprites_Render[DEFAULT_BIND])
-        return CALL_ORIGINAL(rcx, pRenderContext, pParticles, pContext);
-#endif
+    DEBUG_RETURN(COPRenderSprites_Render, rcx, pRenderContext, pParticles, pContext);
 
     if (!Vars::Visuals::Effects::DrawIconsThroughWalls.Value || SDK::CleanScreenshot())
         return CALL_ORIGINAL(rcx, pRenderContext, pParticles, pContext);
@@ -166,10 +163,7 @@ MAKE_HOOK(COPRenderSprites_Render, S::COPRenderSprites_Render(), void,
 MAKE_HOOK(COPRenderSprites_RenderSpriteCard, S::COPRenderSprites_RenderSpriteCard(), void,
     void* rcx, void* meshBuilder, void* pCtx, SpriteRenderInfo_t& info, int hParticle, ParticleRenderData_t* pSortList, void* pCamera)
 {
-#ifdef DEBUG_HOOKS
-    if (!Vars::Hooks::COPRenderSprites_RenderSpriteCard[DEFAULT_BIND])
-        return CALL_ORIGINAL(rcx, meshBuilder, pCtx, info, hParticle, pSortList, pCamera);
-#endif
+    DEBUG_RETURN(COPRenderSprites_RenderSpriteCard, rcx, meshBuilder, pCtx, info, hParticle, pSortList, pCamera);
 
     if (!(Vars::Visuals::World::Modulations.Value & Vars::Visuals::World::ModulationsEnum::Particle) || SDK::CleanScreenshot())
         return CALL_ORIGINAL(rcx, meshBuilder, pCtx, info, hParticle, pSortList, pCamera);
@@ -185,10 +179,7 @@ MAKE_HOOK(COPRenderSprites_RenderSpriteCard, S::COPRenderSprites_RenderSpriteCar
 MAKE_HOOK(COPRenderSprites_RenderTwoSequenceSpriteCard, S::COPRenderSprites_RenderTwoSequenceSpriteCard(), void,
     void* rcx, void* meshBuilder, void* pCtx, SpriteRenderInfo_t& info, int hParticle, ParticleRenderData_t* pSortList, void* pCamera)
 {
-#ifdef DEBUG_HOOKS
-    if (!Vars::Hooks::COPRenderSprites_RenderTwoSequenceSpriteCard[DEFAULT_BIND])
-        return CALL_ORIGINAL(rcx, meshBuilder, pCtx, info, hParticle, pSortList, pCamera);
-#endif
+    DEBUG_RETURN(COPRenderSprites_RenderTwoSequenceSpriteCard, rcx, meshBuilder, pCtx, info, hParticle, pSortList, pCamera);
 
     if (!(Vars::Visuals::World::Modulations.Value &Vars::Visuals::World::ModulationsEnum::Particle) || SDK::CleanScreenshot())
         return CALL_ORIGINAL(rcx, meshBuilder, pCtx, info, hParticle, pSortList, pCamera);
diff --git a/Amalgam/src/Hooks/CParticleProperty_Create.cpp b/Amalgam/src/Hooks/CParticleProperty_Create.cpp
index ae68bd92..43ce2417 100644
--- a/Amalgam/src/Hooks/CParticleProperty_Create.cpp
+++ b/Amalgam/src/Hooks/CParticleProperty_Create.cpp
@@ -12,10 +12,7 @@ MAKE_SIGNATURE(CWeaponMedigun_ManageChargeEffect_CreateName_Call, "client.dll",
 MAKE_HOOK(CParticleProperty_Create_Name, S::CParticleProperty_Create_Name(), void*,
 	void* rcx, const char* pszParticleName, ParticleAttachment_t iAttachType, const char* pszAttachmentName)
 {
-#ifdef DEBUG_HOOKS
-    if (!Vars::Hooks::CParticleProperty_Create_Name[DEFAULT_BIND])
-        return CALL_ORIGINAL(rcx, pszParticleName, iAttachType, pszAttachmentName);
-#endif
+    DEBUG_RETURN(CParticleProperty_Create_Name, rcx, pszParticleName, iAttachType, pszAttachmentName);
 
     const auto dwRetAddr = uintptr_t(_ReturnAddress());
     const auto dwUpdateEffects1 = S::CWeaponMedigun_UpdateEffects_CreateName_Call1();
@@ -96,10 +93,7 @@ MAKE_HOOK(CParticleProperty_Create_Name, S::CParticleProperty_Create_Name(), voi
 MAKE_HOOK(CParticleProperty_Create_Point, S::CParticleProperty_Create_Point(), void*,
 	void* rcx, const char* pszParticleName, ParticleAttachment_t iAttachType, int iAttachmentPoint, Vector vecOriginOffset)
 {
-#ifdef DEBUG_HOOKS
-    if (!Vars::Hooks::CParticleProperty_Create_Point[DEFAULT_BIND])
-        return CALL_ORIGINAL(rcx, pszParticleName, iAttachType, iAttachmentPoint, vecOriginOffset);
-#endif
+    DEBUG_RETURN(CParticleProperty_Create_Point, rcx, pszParticleName, iAttachType, iAttachmentPoint, vecOriginOffset);
 
     if (pszParticleName)
     {
@@ -214,10 +208,7 @@ MAKE_HOOK(CParticleProperty_Create_Point, S::CParticleProperty_Create_Point(), v
 MAKE_HOOK(CParticleProperty_AddControlPoint_Pointer, S::CParticleProperty_AddControlPoint_Pointer(), void,
     void* rcx, void* pEffect, int iPoint, CBaseEntity* pEntity, ParticleAttachment_t iAttachType, const char* pszAttachmentName, Vector vecOriginOffset)
 {
-#ifdef DEBUG_HOOKS
-    if (!Vars::Hooks::CParticleProperty_AddControlPoint_Pointer[DEFAULT_BIND])
-        return CALL_ORIGINAL(rcx, pEffect, iPoint, pEntity, iAttachType, pszAttachmentName, vecOriginOffset);
-#endif
+    DEBUG_RETURN(CParticleProperty_AddControlPoint_Pointer, rcx, pEffect, iPoint, pEntity, iAttachType, pszAttachmentName, vecOriginOffset);
 
     if (!pEffect)
         return; // crash fix
diff --git a/Amalgam/src/Hooks/CPlayerResource_GetPlayerName.cpp b/Amalgam/src/Hooks/CPlayerResource_GetPlayerName.cpp
index 7ca2533d..165ab334 100644
--- a/Amalgam/src/Hooks/CPlayerResource_GetPlayerName.cpp
+++ b/Amalgam/src/Hooks/CPlayerResource_GetPlayerName.cpp
@@ -7,10 +7,7 @@ MAKE_SIGNATURE(CPlayerResource_GetPlayerName, "client.dll", "48 89 5C 24 ? 56 48
 MAKE_HOOK(CPlayerResource_GetPlayerName, S::CPlayerResource_GetPlayerName(), const char*,
 	void* rcx, int iIndex)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CPlayerResource_GetPlayerName[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, iIndex);
-#endif
+	DEBUG_RETURN(CPlayerResource_GetPlayerName, rcx, iIndex);
 
 	return F::PlayerUtils.GetPlayerName(iIndex, CALL_ORIGINAL(rcx, iIndex));
 }
\ No newline at end of file
diff --git a/Amalgam/src/Hooks/CPrediction_RunSimulation.cpp b/Amalgam/src/Hooks/CPrediction_RunSimulation.cpp
index 55bb2e32..7dee8a19 100644
--- a/Amalgam/src/Hooks/CPrediction_RunSimulation.cpp
+++ b/Amalgam/src/Hooks/CPrediction_RunSimulation.cpp
@@ -16,10 +16,7 @@ static std::vector<TickbaseFix_t> s_vTickbaseFixes = {};
 MAKE_HOOK(CPrediction_RunSimulation, S::CPrediction_RunSimulation(), void,
 	void* rcx, int current_command, float curtime, CUserCmd* cmd, CTFPlayer* localPlayer)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CPrediction_RunSimulation[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, current_command, curtime, cmd, localPlayer);
-#endif
+	DEBUG_RETURN(CPrediction_RunSimulation, rcx, current_command, curtime, cmd, localPlayer);
 
 	if (F::Ticks.m_bShifting && F::Ticks.m_iShiftedTicks + 1 == F::Ticks.m_iShiftStart)
 	{
diff --git a/Amalgam/src/Hooks/CRendering3dView_EnableWorldFog.cpp b/Amalgam/src/Hooks/CRendering3dView_EnableWorldFog.cpp
index a8e48daa..27195738 100644
--- a/Amalgam/src/Hooks/CRendering3dView_EnableWorldFog.cpp
+++ b/Amalgam/src/Hooks/CRendering3dView_EnableWorldFog.cpp
@@ -5,10 +5,7 @@ MAKE_SIGNATURE(CRendering3dView_EnableWorldFog, "client.dll", "40 53 48 83 EC ?
 MAKE_HOOK(CRendering3dView_EnableWorldFog, S::CRendering3dView_EnableWorldFog(), void,
 	)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CRendering3dView_EnableWorldFog[DEFAULT_BIND])
-		return CALL_ORIGINAL();
-#endif
+	DEBUG_RETURN(CRendering3dView_EnableWorldFog);
 
 	if (!(Vars::Visuals::World::Modulations.Value & Vars::Visuals::World::ModulationsEnum::Fog) || SDK::CleanScreenshot())
 		return CALL_ORIGINAL();
diff --git a/Amalgam/src/Hooks/CSkyboxView_Enable3dSkyboxFog.cpp b/Amalgam/src/Hooks/CSkyboxView_Enable3dSkyboxFog.cpp
index 8303605a..fa3f7444 100644
--- a/Amalgam/src/Hooks/CSkyboxView_Enable3dSkyboxFog.cpp
+++ b/Amalgam/src/Hooks/CSkyboxView_Enable3dSkyboxFog.cpp
@@ -5,10 +5,7 @@ MAKE_SIGNATURE(CSkyboxView_Enable3dSkyboxFog, "client.dll", "40 57 48 83 EC ? E8
 MAKE_HOOK(CSkyboxView_Enable3dSkyboxFog, S::CSkyboxView_Enable3dSkyboxFog(), void,
 	void* rcx)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CSkyboxView_Enable3dSkyboxFog[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx);
-#endif
+	DEBUG_RETURN(CSkyboxView_Enable3dSkyboxFog, rcx);
 
 	if (!(Vars::Visuals::World::Modulations.Value & Vars::Visuals::World::ModulationsEnum::Fog) || SDK::CleanScreenshot())
 		return CALL_ORIGINAL(rcx);
diff --git a/Amalgam/src/Hooks/CSniperDot_GetRenderingPositions.cpp b/Amalgam/src/Hooks/CSniperDot_GetRenderingPositions.cpp
index aa37d329..e45a5fb0 100644
--- a/Amalgam/src/Hooks/CSniperDot_GetRenderingPositions.cpp
+++ b/Amalgam/src/Hooks/CSniperDot_GetRenderingPositions.cpp
@@ -12,10 +12,7 @@ static Vec3 s_vEyeAngles;
 MAKE_HOOK(CSniperDot_GetRenderingPositions, S::CSniperDot_GetRenderingPositions(), bool,
 	void* rcx, CTFPlayer* pPlayer, Vec3& vecAttachment, Vec3& vecEndPos, float& flSize)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CSniperDot_GetRenderingPositions[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, pPlayer, vecAttachment, vecEndPos, flSize);
-#endif
+	DEBUG_RETURN(CSniperDot_GetRenderingPositions, rcx, pPlayer, vecAttachment, vecEndPos, flSize);
 
 	if (pPlayer && pPlayer->entindex() != I::EngineClient->GetLocalPlayer())
 	{
@@ -31,10 +28,7 @@ MAKE_HOOK(CSniperDot_GetRenderingPositions, S::CSniperDot_GetRenderingPositions(
 MAKE_HOOK(CBasePlayer_EyePosition, S::CBasePlayer_EyePosition(), Vec3*,
 	void* rcx, void* rdx)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CBasePlayer_EyePosition[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, rdx);
-#endif
+	DEBUG_RETURN(CBasePlayer_EyePosition, rcx, rdx);
 
 	const auto dwRetAddr = uintptr_t(_ReturnAddress());
 	const auto dwDesired = S::CSniperDot_GetRenderingPositions_EyePosition_Call();
@@ -48,10 +42,7 @@ MAKE_HOOK(CBasePlayer_EyePosition, S::CBasePlayer_EyePosition(), Vec3*,
 MAKE_HOOK(CTFPlayer_EyeAngles, S::CTFPlayer_EyeAngles(), Vec3*,
 	void* rcx)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CTFPlayer_EyeAngles[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx);
-#endif
+	DEBUG_RETURN(CTFPlayer_EyeAngles, rcx);
 
 	const auto dwRetAddr = uintptr_t(_ReturnAddress());
 	const auto dwDesired = S::CSniperDot_GetRenderingPositions_EyeAngles_Call();
diff --git a/Amalgam/src/Hooks/CSoundEmitterSystem_EmitSound.cpp b/Amalgam/src/Hooks/CSoundEmitterSystem_EmitSound.cpp
index d1f405c5..e6d0f488 100644
--- a/Amalgam/src/Hooks/CSoundEmitterSystem_EmitSound.cpp
+++ b/Amalgam/src/Hooks/CSoundEmitterSystem_EmitSound.cpp
@@ -133,10 +133,7 @@ static inline bool ShouldBlockSound(const char* pSound)
 MAKE_HOOK(CSoundEmitterSystem_EmitSound, S::CSoundEmitterSystem_EmitSound(), void,
 	void* rcx, IRecipientFilter& filter, int entindex, const EmitSound_t& ep)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CSoundEmitterSystem_EmitSound[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, filter, entindex, ep);
-#endif
+	DEBUG_RETURN(CSoundEmitterSystem_EmitSound, rcx, filter, entindex, ep);
 
 	if (ShouldBlockSound(ep.m_pSoundName))
 		return;
@@ -148,10 +145,7 @@ MAKE_HOOK(CSoundEmitterSystem_EmitSound, S::CSoundEmitterSystem_EmitSound(), voi
 MAKE_HOOK(S_StartDynamicSound, S::S_StartDynamicSound(), int,
 	StartSoundParams_t& params)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::S_StartDynamicSound[DEFAULT_BIND])
-		return CALL_ORIGINAL(params);
-#endif
+	DEBUG_RETURN(S_StartDynamicSound, params);
 
 	H::Entities.ManualNetwork(params);
 	if (params.pSfx && ShouldBlockSound(params.pSfx->getname()))
@@ -164,10 +158,7 @@ MAKE_HOOK(S_StartDynamicSound, S::S_StartDynamicSound(), int,
 MAKE_HOOK(S_StartSound, S::S_StartSound(), int,
 	StartSoundParams_t& params)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::S_StartSound[DEFAULT_BIND])
-		return CALL_ORIGINAL(params);
-#endif
+	DEBUG_RETURN(S_StartSound, params);
 
 	if (!params.staticsound)
 		H::Entities.ManualNetwork(params);
@@ -180,6 +171,8 @@ MAKE_HOOK(S_StartSound, S::S_StartSound(), int,
 MAKE_HOOK(CBaseEntity_EmitSound, S::CBaseEntity_EmitSound(), void,
 	void* rcx, const char* soundname, float soundtime, float* duration)
 {
+	DEBUG_RETURN(CBaseEntity_EmitSound, rcx, soundname, soundtime, duration);
+
 	if (soundname)
 	{
 		switch (FNV1A::Hash32(soundname))
diff --git a/Amalgam/src/Hooks/CStaticPropMgr_ComputePropOpacity.cpp b/Amalgam/src/Hooks/CStaticPropMgr_ComputePropOpacity.cpp
index 30c08861..7eaf5840 100644
--- a/Amalgam/src/Hooks/CStaticPropMgr_ComputePropOpacity.cpp
+++ b/Amalgam/src/Hooks/CStaticPropMgr_ComputePropOpacity.cpp
@@ -41,10 +41,7 @@ public:
 MAKE_HOOK(CStaticPropMgr_ComputePropOpacity, S::CStaticPropMgr_ComputePropOpacity(), void,
 	void* rcx, CStaticProp* pProp)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CStaticPropMgr_ComputePropOpacity[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, pProp);
-#endif
+	DEBUG_RETURN(CStaticPropMgr_ComputePropOpacity, rcx, pProp);
 
 	if (Vars::Visuals::World::NoPropFade.Value && pProp)
 	{
diff --git a/Amalgam/src/Hooks/CStaticPropMgr_DrawStaticProps.cpp b/Amalgam/src/Hooks/CStaticPropMgr_DrawStaticProps.cpp
index da04a83a..451ccbf8 100644
--- a/Amalgam/src/Hooks/CStaticPropMgr_DrawStaticProps.cpp
+++ b/Amalgam/src/Hooks/CStaticPropMgr_DrawStaticProps.cpp
@@ -7,10 +7,7 @@ static bool s_bDrawingProps = false;
 MAKE_HOOK(CStaticPropMgr_DrawStaticProps, S::CStaticPropMgr_DrawStaticProps(), void,
 	void* rcx, IClientRenderable** pProps, int count, bool bShadowDepth, bool drawVCollideWireframe)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CStaticPropMgr_DrawStaticProps[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, pProps, count, bShadowDepth, drawVCollideWireframe);
-#endif
+	DEBUG_RETURN(CStaticPropMgr_DrawStaticProps, rcx, pProps, count, bShadowDepth, drawVCollideWireframe);
 
 	s_bDrawingProps = true;
 	CALL_ORIGINAL(rcx, pProps, count, bShadowDepth, drawVCollideWireframe);
@@ -20,10 +17,7 @@ MAKE_HOOK(CStaticPropMgr_DrawStaticProps, S::CStaticPropMgr_DrawStaticProps(), v
 MAKE_HOOK(CStudioRender_SetColorModulation, U::Memory.GetVirtual(I::StudioRender, 27), void,
 	void* rcx, const float* pColor)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CStudioRender_SetColorModulation[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, pColor);
-#endif
+	DEBUG_RETURN(CStudioRender_SetColorModulation, rcx, pColor);
 
 	if (!s_bDrawingProps || !(Vars::Visuals::World::Modulations.Value & Vars::Visuals::World::ModulationsEnum::Prop) || SDK::CleanScreenshot())
 		return CALL_ORIGINAL(rcx, pColor);
@@ -39,10 +33,7 @@ MAKE_HOOK(CStudioRender_SetColorModulation, U::Memory.GetVirtual(I::StudioRender
 MAKE_HOOK(CStudioRender_SetAlphaModulation, U::Memory.GetVirtual(I::StudioRender, 28), void,
 	void* rcx, float flAlpha)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CStudioRender_SetAlphaModulation[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, flAlpha);
-#endif
+	DEBUG_RETURN(CStudioRender_SetAlphaModulation, rcx, flAlpha);
 
 	if (!s_bDrawingProps || !(Vars::Visuals::World::Modulations.Value & Vars::Visuals::World::ModulationsEnum::Prop) || SDK::CleanScreenshot())
 		return CALL_ORIGINAL(rcx, flAlpha);
diff --git a/Amalgam/src/Hooks/CStudioRender_DrawModelStaticProp.cpp b/Amalgam/src/Hooks/CStudioRender_DrawModelStaticProp.cpp
index c1d3b78c..a65392a7 100644
--- a/Amalgam/src/Hooks/CStudioRender_DrawModelStaticProp.cpp
+++ b/Amalgam/src/Hooks/CStudioRender_DrawModelStaticProp.cpp
@@ -3,10 +3,7 @@
 MAKE_HOOK(CStudioRender_DrawModelStaticProp, U::Memory.GetVirtual(I::StudioRender, 30), void,
 	void* rcx, const DrawModelState_t& pState, const matrix3x4& modelToWorld, int flags)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CStudioRender_DrawModelStaticProp[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, pState, modelToWorld, flags);
-#endif
+	DEBUG_RETURN(CStudioRender_DrawModelStaticProp, rcx, pState, modelToWorld, flags);
 
 	if (Vars::Visuals::World::NearPropFade.Value)
 	{
diff --git a/Amalgam/src/Hooks/CTFBadgePanel_SetupBadge.cpp b/Amalgam/src/Hooks/CTFBadgePanel_SetupBadge.cpp
index d1857df2..27644643 100644
--- a/Amalgam/src/Hooks/CTFBadgePanel_SetupBadge.cpp
+++ b/Amalgam/src/Hooks/CTFBadgePanel_SetupBadge.cpp
@@ -7,10 +7,7 @@ MAKE_SIGNATURE(CTFBadgePanel_SetupBadge, "client.dll", "48 85 D2 0F 84 ? ? ? ? 4
 MAKE_HOOK(CTFBadgePanel_SetupBadge, S::CTFBadgePanel_SetupBadge(), void,
 	void* rcx, const IMatchGroupDescription* pMatchDesc, /*const*/ LevelInfo_t& levelInfo, const CSteamID& steamID)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CTFBadgePanel_SetupBadge[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, pMatchDesc, levelInfo, steamID);
-#endif
+	DEBUG_RETURN(CTFBadgePanel_SetupBadge, rcx, pMatchDesc, levelInfo, steamID);
 
 	int nOldLevelNum = levelInfo.m_nLevelNum;
 
diff --git a/Amalgam/src/Hooks/CTFClientScoreBoardDialog_UpdatePlayerAvatar.cpp b/Amalgam/src/Hooks/CTFClientScoreBoardDialog_UpdatePlayerAvatar.cpp
index ac291c6c..83f9d1d0 100644
--- a/Amalgam/src/Hooks/CTFClientScoreBoardDialog_UpdatePlayerAvatar.cpp
+++ b/Amalgam/src/Hooks/CTFClientScoreBoardDialog_UpdatePlayerAvatar.cpp
@@ -41,10 +41,7 @@ static inline void SetScoreboardColor(int iIndex, Color_t& tColor)
 MAKE_HOOK(CAvatarImage_SetAvatarSteamID, S::CAvatarImage_SetAvatarSteamID(), bool,
 	void* rcx, CSteamID steamIDUser, EAvatarSize avatarSize)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CAvatarImage_SetAvatarSteamID[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, steamIDUser, avatarSize);
-#endif
+	DEBUG_RETURN(CAvatarImage_SetAvatarSteamID, rcx, steamIDUser, avatarSize);
 
 	if (!(F::PlayerUtils.GetNameType(steamIDUser.GetAccountID()) & NameTypeEnum::Privacy))
 		return CALL_ORIGINAL(rcx, steamIDUser, avatarSize);
@@ -55,10 +52,7 @@ MAKE_HOOK(CAvatarImage_SetAvatarSteamID, S::CAvatarImage_SetAvatarSteamID(), boo
 MAKE_HOOK(CAvatarImagePanel_SetPlayer, S::CAvatarImagePanel_SetPlayer(), void,
 	void* rcx, CSteamID steamIDForPlayer, EAvatarSize avatarSize)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CAvatarImagePanel_SetPlayer[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, steamIDForPlayer, avatarSize);
-#endif
+	DEBUG_RETURN(CAvatarImagePanel_SetPlayer, rcx, steamIDForPlayer, avatarSize);
 
 	if (!(F::PlayerUtils.GetNameType(steamIDForPlayer.GetAccountID()) & NameTypeEnum::Privacy))
 		return CALL_ORIGINAL(rcx, steamIDForPlayer, avatarSize);
@@ -69,10 +63,7 @@ MAKE_HOOK(CAvatarImagePanel_SetPlayer, S::CAvatarImagePanel_SetPlayer(), void,
 MAKE_HOOK(CTFClientScoreBoardDialog_UpdatePlayerAvatar, S::CTFClientScoreBoardDialog_UpdatePlayerAvatar(), void,
 	void* rcx, int playerIndex, KeyValues* kv)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CTFClientScoreBoardDialog_UpdatePlayerAvatar[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, playerIndex, kv);
-#endif
+	DEBUG_RETURN(CTFClientScoreBoardDialog_UpdatePlayerAvatar, rcx, playerIndex, kv);
 
 	s_iPlayerIndex = playerIndex;
 
@@ -83,10 +74,7 @@ MAKE_HOOK(CTFClientScoreBoardDialog_UpdatePlayerAvatar, S::CTFClientScoreBoardDi
 MAKE_HOOK(CTFMatchSummary_UpdatePlayerAvatar, S::CTFMatchSummary_UpdatePlayerAvatar(), void,
 	void* rcx, int playerIndex, KeyValues* kv)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CTFMatchSummary_UpdatePlayerAvatar[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, playerIndex, kv);
-#endif
+	DEBUG_RETURN(CTFMatchSummary_UpdatePlayerAvatar, rcx, playerIndex, kv);
 
 	if (!(F::PlayerUtils.GetNameType(playerIndex) & NameTypeEnum::Privacy))
 		CALL_ORIGINAL(rcx, playerIndex, kv);
@@ -95,10 +83,7 @@ MAKE_HOOK(CTFMatchSummary_UpdatePlayerAvatar, S::CTFMatchSummary_UpdatePlayerAva
 MAKE_HOOK(CTFHudMannVsMachineScoreboard_UpdatePlayerAvatar, S::CTFHudMannVsMachineScoreboard_UpdatePlayerAvatar(), void,
 	void* rcx, int playerIndex, KeyValues* kv)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CTFHudMannVsMachineScoreboard_UpdatePlayerAvatar[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, playerIndex, kv);
-#endif
+	DEBUG_RETURN(CTFHudMannVsMachineScoreboard_UpdatePlayerAvatar, rcx, playerIndex, kv);
 
 	if (!(F::PlayerUtils.GetNameType(playerIndex) & NameTypeEnum::Privacy))
 		CALL_ORIGINAL(rcx, playerIndex, kv);
@@ -107,10 +92,7 @@ MAKE_HOOK(CTFHudMannVsMachineScoreboard_UpdatePlayerAvatar, S::CTFHudMannVsMachi
 MAKE_HOOK(CTFHudMatchStatus_UpdatePlayerAvatar, S::CTFHudMatchStatus_UpdatePlayerAvatar(), void,
 	void* rcx, int playerIndex, KeyValues* kv)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CTFHudMatchStatus_UpdatePlayerAvatar[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, playerIndex, kv);
-#endif
+	DEBUG_RETURN(CTFHudMatchStatus_UpdatePlayerAvatar, rcx, playerIndex, kv);
 
 	if (!(F::PlayerUtils.GetNameType(playerIndex) & NameTypeEnum::Privacy))
 		CALL_ORIGINAL(rcx, playerIndex, kv);
@@ -119,10 +101,7 @@ MAKE_HOOK(CTFHudMatchStatus_UpdatePlayerAvatar, S::CTFHudMatchStatus_UpdatePlaye
 MAKE_HOOK(SectionedListPanel_SetItemFgColor, S::SectionedListPanel_SetItemFgColor(), void,
 	void* rcx, int itemID, Color_t color)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::SectionedListPanel_SetItemFgColor[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, itemID, color);
-#endif
+	DEBUG_RETURN(SectionedListPanel_SetItemFgColor, rcx, itemID, color);
 
 	const auto dwRetAddr = uintptr_t(_ReturnAddress());
 	const auto dwDesired = S::CTFClientScoreBoardDialog_UpdatePlayerList_SetItemFgColor_Call();
diff --git a/Amalgam/src/Hooks/CTFGCClientSystem_UpdateAssignedLobby.cpp b/Amalgam/src/Hooks/CTFGCClientSystem_UpdateAssignedLobby.cpp
index 1ae9d2b0..1fc52ef6 100644
--- a/Amalgam/src/Hooks/CTFGCClientSystem_UpdateAssignedLobby.cpp
+++ b/Amalgam/src/Hooks/CTFGCClientSystem_UpdateAssignedLobby.cpp
@@ -3,10 +3,7 @@
 MAKE_HOOK(CTFGCClientSystem_UpdateAssignedLobby, S::CTFGCClientSystem_UpdateAssignedLobby(), bool,
 	void* rcx)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CTFGCClientSystem_UpdateAssignedLobby[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx);
-#endif
+	DEBUG_RETURN(CTFGCClientSystem_UpdateAssignedLobby, rcx);
 
 	bool bReturn = CALL_ORIGINAL(rcx);
 
diff --git a/Amalgam/src/Hooks/CTFInput_ApplyMouse.cpp b/Amalgam/src/Hooks/CTFInput_ApplyMouse.cpp
index fdb1782b..f7660d37 100644
--- a/Amalgam/src/Hooks/CTFInput_ApplyMouse.cpp
+++ b/Amalgam/src/Hooks/CTFInput_ApplyMouse.cpp
@@ -7,10 +7,7 @@ MAKE_SIGNATURE(CTFPlayerShared_CalculateChargeCap, "client.dll", "48 83 EC ? 4C
 MAKE_HOOK(CTFInput_ApplyMouse, S::CTFInput_ApplyMouse(), void,
 	void* rcx, QAngle& viewangles, CUserCmd* cmd, float mouse_x, float mouse_y)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CTFInput_ApplyMouse[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, viewangles, cmd, mouse_x, mouse_y);
-#endif
+	DEBUG_RETURN(CTFInput_ApplyMouse, rcx, viewangles, cmd, mouse_x, mouse_y);
 
 	// we should maybe predict the shield cond for better accuracy
 
@@ -44,10 +41,7 @@ MAKE_HOOK(CTFInput_ApplyMouse, S::CTFInput_ApplyMouse(), void,
 MAKE_HOOK(CTFInput_CAM_CapYaw, S::CTFInput_CAM_CapYaw(), float,
 	void* rcx, float fVal)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CTFInput_CAM_CapYaw[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, fVal);
-#endif
+	DEBUG_RETURN(CTFInput_CAM_CapYaw, rcx, fVal);
 
 	if (!Vars::Misc::Movement::ShieldTurnRate.Value)
 		return CALL_ORIGINAL(rcx, fVal);
diff --git a/Amalgam/src/Hooks/CTFPlayerInventory_GetMaxItemCount.cpp b/Amalgam/src/Hooks/CTFPlayerInventory_GetMaxItemCount.cpp
index fe8fdc98..515794ba 100644
--- a/Amalgam/src/Hooks/CTFPlayerInventory_GetMaxItemCount.cpp
+++ b/Amalgam/src/Hooks/CTFPlayerInventory_GetMaxItemCount.cpp
@@ -5,10 +5,7 @@ MAKE_SIGNATURE(CTFPlayerInventory_GetMaxItemCount, "client.dll", "40 53 48 83 EC
 MAKE_HOOK(CTFPlayerInventory_GetMaxItemCount, S::CTFPlayerInventory_GetMaxItemCount(), int,
 	void* rcx)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CTFPlayerInventory_GetMaxItemCount[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx);
-#endif
+	DEBUG_RETURN(CTFPlayerInventory_GetMaxItemCount, rcx);
 
 	if (Vars::Misc::Exploits::BackpackExpander.Value)
 		return 4000;
diff --git a/Amalgam/src/Hooks/CTFPlayerInventory_VerifyChangedLoadoutsAreValid.cpp b/Amalgam/src/Hooks/CTFPlayerInventory_VerifyChangedLoadoutsAreValid.cpp
index 65389004..38768ead 100644
--- a/Amalgam/src/Hooks/CTFPlayerInventory_VerifyChangedLoadoutsAreValid.cpp
+++ b/Amalgam/src/Hooks/CTFPlayerInventory_VerifyChangedLoadoutsAreValid.cpp
@@ -8,10 +8,7 @@ MAKE_SIGNATURE(CEquipSlotItemSelectionPanel_UpdateModelPanelsForSelection_GetIte
 MAKE_HOOK(CTFPlayerInventory_VerifyChangedLoadoutsAreValid, S::CTFPlayerInventory_VerifyChangedLoadoutsAreValid(), void,
 	void* rcx)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CTFPlayerInventory_VerifyChangedLoadoutsAreValid[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx);
-#endif
+	DEBUG_RETURN(CTFPlayerInventory_VerifyChangedLoadoutsAreValid, rcx);
 
 	if (!Vars::Misc::Exploits::EquipRegionUnlock.Value)
 		CALL_ORIGINAL(rcx);
@@ -20,10 +17,7 @@ MAKE_HOOK(CTFPlayerInventory_VerifyChangedLoadoutsAreValid, S::CTFPlayerInventor
 MAKE_HOOK(GenerateEquipRegionConflictMask, S::GenerateEquipRegionConflictMask(), uint32_t,
 	int iClass, int iUpToSlot, int iIgnoreSlot)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::GenerateEquipRegionConflictMask[DEFAULT_BIND])
-		return CALL_ORIGINAL(iClass, iUpToSlot, iIgnoreSlot);
-#endif
+	DEBUG_RETURN(CTFPlayerInventory_VerifyChangedLoadoutsAreValid, iClass, iUpToSlot, iIgnoreSlot);
 
 	if (Vars::Misc::Exploits::EquipRegionUnlock.Value)
 		return 0;
@@ -34,10 +28,7 @@ MAKE_HOOK(GenerateEquipRegionConflictMask, S::GenerateEquipRegionConflictMask(),
 MAKE_HOOK(CTFInventoryManager_GetItemInLoadoutForClass, S::CTFInventoryManager_GetItemInLoadoutForClass(), void*,
 	void* rcx, int iClass, int iSlot, CSteamID* pID)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CTFInventoryManager_GetItemInLoadoutForClass[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, iClass, iSlot, pID);
-#endif
+	DEBUG_RETURN(CTFPlayerInventory_VerifyChangedLoadoutsAreValid, rcx, iClass, iSlot, pID);
 
 	const auto dwRetAddr = uintptr_t(_ReturnAddress());
 	const auto dwDesired = S::CEquipSlotItemSelectionPanel_UpdateModelPanelsForSelection_GetItemInLoadoutForClass_Call();
diff --git a/Amalgam/src/Hooks/CTFPlayerPanel_GetTeam.cpp b/Amalgam/src/Hooks/CTFPlayerPanel_GetTeam.cpp
index 1b2d0ffa..07213270 100644
--- a/Amalgam/src/Hooks/CTFPlayerPanel_GetTeam.cpp
+++ b/Amalgam/src/Hooks/CTFPlayerPanel_GetTeam.cpp
@@ -33,10 +33,7 @@ static inline void SetScoreboardColor(int iIndex, Color_t& tColor)
 MAKE_HOOK(CTFPlayerPanel_GetTeam, S::CTFPlayerPanel_GetTeam(), int,
 	void* rcx)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CTFPlayerPanel_GetTeam[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx);
-#endif
+	DEBUG_RETURN(CTFPlayerPanel_GetTeam, rcx);
 
 	const auto dwRetAddr = uintptr_t(_ReturnAddress());
 	const auto dwDesired = S::CTFTeamStatusPlayerPanel_Update_GetTeam_Call();
@@ -63,10 +60,7 @@ MAKE_HOOK(CTFPlayerPanel_GetTeam, S::CTFPlayerPanel_GetTeam(), int,
 MAKE_HOOK(vgui_Panel_SetBgColor, S::vgui_Panel_SetBgColor(), void,
 	void* rcx, Color_t color)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::vgui_Panel_SetBgColor[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, color);
-#endif
+	DEBUG_RETURN(CTFPlayerPanel_GetTeam, rcx, color);
 
 	const auto dwRetAddr = uintptr_t(_ReturnAddress());
 	const auto dwDesired = S::CTFTeamStatusPlayerPanel_Update_SetBgColor_Call();
@@ -80,10 +74,7 @@ MAKE_HOOK(vgui_Panel_SetBgColor, S::vgui_Panel_SetBgColor(), void,
 MAKE_HOOK(CTFTeamStatus_OnTick, S::CTFTeamStatus_OnTick(), void,
 	void* rcx)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CTFTeamStatus_OnTick[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx);
-#endif
+	DEBUG_RETURN(CTFTeamStatus_OnTick, rcx);
 
 	s_pTeamStatus = rcx;
 
@@ -93,10 +84,7 @@ MAKE_HOOK(CTFTeamStatus_OnTick, S::CTFTeamStatus_OnTick(), void,
 MAKE_HOOK(CVGui_RunFrame, S::CVGui_RunFrame(), void,
 	void* rcx)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CVGui_RunFrame[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx);
-#endif
+	DEBUG_RETURN(CVGui_RunFrame, rcx);
 
 	if (!s_pTeamStatus)
 		return CALL_ORIGINAL(rcx);
diff --git a/Amalgam/src/Hooks/CTFPlayerShared_InCond.cpp b/Amalgam/src/Hooks/CTFPlayerShared_InCond.cpp
index b98a990d..6b3fdc1f 100644
--- a/Amalgam/src/Hooks/CTFPlayerShared_InCond.cpp
+++ b/Amalgam/src/Hooks/CTFPlayerShared_InCond.cpp
@@ -11,10 +11,7 @@ MAKE_SIGNATURE(CTFInput_ApplyMouse_InCond_Call, "client.dll", "84 C0 74 ? F3 0F
 MAKE_HOOK(CTFPlayerShared_InCond, S::CTFPlayerShared_InCond(), bool,
 	void* rcx, ETFCond nCond)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CTFPlayerShared_InCond[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, nCond);
-#endif
+	DEBUG_RETURN(CTFPlayerShared_InCond, rcx, nCond);
 
 	const auto dwRetAddr = uintptr_t(_ReturnAddress());
 	const auto dwZoomPlayer = S::CTFPlayer_ShouldDraw_InCond_Call();
diff --git a/Amalgam/src/Hooks/CTFPlayerShared_IsPlayerDominated.cpp b/Amalgam/src/Hooks/CTFPlayerShared_IsPlayerDominated.cpp
index 05ed74e8..f34da263 100644
--- a/Amalgam/src/Hooks/CTFPlayerShared_IsPlayerDominated.cpp
+++ b/Amalgam/src/Hooks/CTFPlayerShared_IsPlayerDominated.cpp
@@ -10,10 +10,7 @@ MAKE_SIGNATURE(CClientScoreBoardDialog_NeedsUpdate, "client.dll", "48 8B 05 ? ?
 MAKE_HOOK(CTFPlayerShared_IsPlayerDominated, S::CTFPlayerShared_IsPlayerDominated(), bool,
 	void* rcx, int index)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CTFPlayerShared_IsPlayerDominated[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, index);
-#endif
+	DEBUG_RETURN(CTFPlayerShared_IsPlayerDominated, rcx, index);
 
 	const auto dwRetAddr = uintptr_t(_ReturnAddress());
 	const auto dwDesired = S::CTFClientScoreBoardDialog_UpdatePlayerList_IsPlayerDominated_Call();
@@ -30,10 +27,7 @@ MAKE_HOOK(CTFPlayerShared_IsPlayerDominated, S::CTFPlayerShared_IsPlayerDominate
 MAKE_HOOK(KeyValues_SetInt, S::KeyValues_SetInt(), void,
 	void* rcx, const char* keyName, int value)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::KeyValues_SetInt[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, keyName, value);
-#endif
+	DEBUG_RETURN(KeyValues_SetInt, rcx, keyName, value);
 
 	const auto dwRetAddr = uintptr_t(_ReturnAddress());
 	const auto dwDesired = S::CTFClientScoreBoardDialog_UpdatePlayerList_SetInt_Call();
@@ -48,10 +42,7 @@ MAKE_HOOK(KeyValues_SetInt, S::KeyValues_SetInt(), void,
 MAKE_HOOK(CClientScoreBoardDialog_NeedsUpdate, S::CClientScoreBoardDialog_NeedsUpdate(), bool,
 	void* rcx)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CClientScoreBoardDialog_NeedsUpdate[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx);
-#endif
+	DEBUG_RETURN(CClientScoreBoardDialog_NeedsUpdate, rcx);
 
 	static bool bStaticMod = false;
 	const bool bLastMod = bStaticMod;
diff --git a/Amalgam/src/Hooks/CTFPlayerShared_ShouldSuppressPrediction.cpp b/Amalgam/src/Hooks/CTFPlayerShared_ShouldSuppressPrediction.cpp
index 4691cefc..1eb2fed7 100644
--- a/Amalgam/src/Hooks/CTFPlayerShared_ShouldSuppressPrediction.cpp
+++ b/Amalgam/src/Hooks/CTFPlayerShared_ShouldSuppressPrediction.cpp
@@ -5,10 +5,7 @@ MAKE_SIGNATURE(CTFPlayerShared_ShouldSuppressPrediction, "client.dll", "8B 81 ?
 MAKE_HOOK(CTFPlayerShared_ShouldSuppressPrediction, S::CTFPlayerShared_ShouldSuppressPrediction(), bool,
 	void* rcx)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CTFPlayerShared_ShouldSuppressPrediction[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx);
-#endif
+	DEBUG_RETURN(CTFPlayerShared_ShouldSuppressPrediction, rcx);
 
 	return false;
 }
\ No newline at end of file
diff --git a/Amalgam/src/Hooks/CTFPlayer_AvoidPlayers.cpp b/Amalgam/src/Hooks/CTFPlayer_AvoidPlayers.cpp
index 0a532dcd..5ab46bab 100644
--- a/Amalgam/src/Hooks/CTFPlayer_AvoidPlayers.cpp
+++ b/Amalgam/src/Hooks/CTFPlayer_AvoidPlayers.cpp
@@ -5,10 +5,7 @@ MAKE_SIGNATURE(CTFPlayer_AvoidPlayers, "client.dll", "48 89 54 24 ? 55 41 56", 0
 MAKE_HOOK(CTFPlayer_AvoidPlayers, S::CTFPlayer_AvoidPlayers(), void,
 	void* rcx, CUserCmd* pCmd)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CTFPlayer_AvoidPlayers[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, pCmd);
-#endif
+	DEBUG_RETURN(CTFPlayer_AvoidPlayers, rcx, pCmd);
 
 	if (Vars::Misc::Movement::NoPush.Value)
 		return;
diff --git a/Amalgam/src/Hooks/CTFPlayer_BRenderAsZombie.cpp b/Amalgam/src/Hooks/CTFPlayer_BRenderAsZombie.cpp
index bc4eb55c..169a9059 100644
--- a/Amalgam/src/Hooks/CTFPlayer_BRenderAsZombie.cpp
+++ b/Amalgam/src/Hooks/CTFPlayer_BRenderAsZombie.cpp
@@ -6,10 +6,7 @@ MAKE_SIGNATURE(CTFRagdoll_CreateTFRagdoll_BRenderAsZombie_Call, "client.dll", "8
 MAKE_HOOK(CTFPlayer_BRenderAsZombie, S::CTFPlayer_BRenderAsZombie(), bool,
 	void* rcx, bool bWeaponsCheck)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CTFPlayer_BRenderAsZombie[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, bWeaponsCheck);
-#endif
+	DEBUG_RETURN(CTFPlayer_BRenderAsZombie, rcx, bWeaponsCheck);
 
 	const auto dwRetAddr = uintptr_t(_ReturnAddress());
 	const auto dwDesired = S::CTFRagdoll_CreateTFRagdoll_BRenderAsZombie_Call();
diff --git a/Amalgam/src/Hooks/CTFPlayer_BuildTransformations.cpp b/Amalgam/src/Hooks/CTFPlayer_BuildTransformations.cpp
index 8ec50fd2..d9176798 100644
--- a/Amalgam/src/Hooks/CTFPlayer_BuildTransformations.cpp
+++ b/Amalgam/src/Hooks/CTFPlayer_BuildTransformations.cpp
@@ -5,10 +5,7 @@ MAKE_SIGNATURE(CTFPlayer_BuildTransformations, "client.dll", "48 8B C4 48 89 58
 MAKE_HOOK(CTFPlayer_BuildTransformations, S::CTFPlayer_BuildTransformations(), void,
 	void* rcx, CStudioHdr* hdr, Vector* pos, Quaternion q[], const matrix3x4& cameraTransform, int boneMask, void* boneComputed)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CTFPlayer_BuildTransformations[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, hdr, pos, q, cameraTransform, boneMask, boneComputed);
-#endif
+	DEBUG_RETURN(CTFPlayer_BuildTransformations, rcx, hdr, pos, q, cameraTransform, boneMask, boneComputed);
 
 	auto pPlayer = reinterpret_cast<CTFPlayer*>(rcx);
 	auto iOriginal = pPlayer->m_fFlags();
diff --git a/Amalgam/src/Hooks/CTFPlayer_DoAnimationEvent.cpp b/Amalgam/src/Hooks/CTFPlayer_DoAnimationEvent.cpp
index 4136ad7e..7a9c0c3c 100644
--- a/Amalgam/src/Hooks/CTFPlayer_DoAnimationEvent.cpp
+++ b/Amalgam/src/Hooks/CTFPlayer_DoAnimationEvent.cpp
@@ -5,10 +5,7 @@ MAKE_SIGNATURE(CTFPlayer_DoAnimationEvent, "client.dll", "48 89 6C 24 ? 48 89 74
 MAKE_HOOK(CTFPlayer_DoAnimationEvent, S::CTFPlayer_DoAnimationEvent(), void,
 	void* rcx, PlayerAnimEvent_t event, int nData)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CTFPlayer_DoAnimationEvent[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, event, nData);
-#endif
+	DEBUG_RETURN(CTFPlayer_DoAnimationEvent, rcx, event, nData);
 
 	auto pPlayer = reinterpret_cast<CTFPlayer*>(rcx);
 	if (pPlayer->entindex() != I::EngineClient->GetLocalPlayer())
diff --git a/Amalgam/src/Hooks/CTFPlayer_FireBullet.cpp b/Amalgam/src/Hooks/CTFPlayer_FireBullet.cpp
index 6e21fe33..3042ed3b 100644
--- a/Amalgam/src/Hooks/CTFPlayer_FireBullet.cpp
+++ b/Amalgam/src/Hooks/CTFPlayer_FireBullet.cpp
@@ -7,10 +7,7 @@ MAKE_SIGNATURE(CTFPlayer_FireBullet, "client.dll", "48 89 74 24 ? 55 57 41 55 41
 MAKE_HOOK(CTFPlayer_FireBullet, S::CTFPlayer_FireBullet(), void,
 	void* rcx, CBaseCombatWeapon* pWeapon, const FireBulletsInfo_t& info, bool bDoEffects, int nDamageType, int nCustomDamageType)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CTFPlayer_FireBullet[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, pWeapon, info, nDamageType, nDamageType, nCustomDamageType);
-#endif
+	DEBUG_RETURN(CTFPlayer_FireBullet, rcx, pWeapon, info, nDamageType, nDamageType, nCustomDamageType);
 
 	auto pLocal = reinterpret_cast<CTFPlayer*>(rcx);
 	if (pLocal != H::Entities.GetLocal() || !pWeapon)
diff --git a/Amalgam/src/Hooks/CTFPlayer_GetMinFOV.cpp b/Amalgam/src/Hooks/CTFPlayer_GetMinFOV.cpp
index 430b94cf..44108101 100644
--- a/Amalgam/src/Hooks/CTFPlayer_GetMinFOV.cpp
+++ b/Amalgam/src/Hooks/CTFPlayer_GetMinFOV.cpp
@@ -5,10 +5,7 @@ MAKE_SIGNATURE(CTFPlayer_GetMinFOV, "client.dll", "F3 0F 10 05 ? ? ? ? C3 CC CC
 MAKE_HOOK(CTFPlayer_GetMinFOV, S::CTFPlayer_GetMinFOV(), float,
 	/*void* rcx*/)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CTFPlayer_GetMinFOV[DEFAULT_BIND])
-		return CALL_ORIGINAL(/*rcx*/);
-#endif
+	DEBUG_RETURN(CTFPlayer_GetMinFOV, /*rcx*/);
 
 	return 0.f;
 }
\ No newline at end of file
diff --git a/Amalgam/src/Hooks/CTFPlayer_IsPlayerClass.cpp b/Amalgam/src/Hooks/CTFPlayer_IsPlayerClass.cpp
index 2b9955be..2e7a0c3a 100644
--- a/Amalgam/src/Hooks/CTFPlayer_IsPlayerClass.cpp
+++ b/Amalgam/src/Hooks/CTFPlayer_IsPlayerClass.cpp
@@ -6,10 +6,7 @@ MAKE_SIGNATURE(CDamageAccountPanel_DisplayDamageFeedback_IsPlayerClass_Call, "cl
 MAKE_HOOK(CTFPlayer_IsPlayerClass, S::CTFPlayer_IsPlayerClass(), bool,
 	void* rcx, int iClass)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CTFPlayer_IsPlayerClass[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, iClass);
-#endif
+	DEBUG_RETURN(CTFPlayer_IsPlayerClass, rcx, iClass);
 
 	const auto dwRetAddr = uintptr_t(_ReturnAddress());
 	static const auto dwDesired = S::CDamageAccountPanel_DisplayDamageFeedback_IsPlayerClass_Call();
diff --git a/Amalgam/src/Hooks/CTFPlayer_ShouldDraw.cpp b/Amalgam/src/Hooks/CTFPlayer_ShouldDraw.cpp
index 606b9f46..1a9aef0c 100644
--- a/Amalgam/src/Hooks/CTFPlayer_ShouldDraw.cpp
+++ b/Amalgam/src/Hooks/CTFPlayer_ShouldDraw.cpp
@@ -14,10 +14,7 @@ MAKE_SIGNATURE(CBasePlayer_BuildFirstPersonMeathookTransformations_ShouldDrawThi
 MAKE_HOOK(CTFPlayer_ShouldDraw, S::CTFPlayer_ShouldDraw(), bool,
 	void* rcx)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CTFPlayer_ShouldDraw[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx);
-#endif
+	DEBUG_RETURN(CTFPlayer_ShouldDraw, rcx);
 
 	if (F::Spectate.HasTarget() && !I::EngineClient->IsHLTV())
 	{
@@ -35,10 +32,7 @@ MAKE_HOOK(CTFPlayer_ShouldDraw, S::CTFPlayer_ShouldDraw(), bool,
 MAKE_HOOK(CBasePlayer_ShouldDrawThisPlayer, S::CBasePlayer_ShouldDrawThisPlayer(), bool,
 	void* rcx)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CBasePlayer_ShouldDrawThisPlayer[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx);
-#endif
+	DEBUG_RETURN(CBasePlayer_ShouldDrawThisPlayer, rcx);
 
 	const auto dwRetAddr = uintptr_t(_ReturnAddress());
 	//const auto dwDesired = S::CTFWeaponBase_PostDataUpdate_ShouldDrawThisPlayer_Call();
@@ -66,10 +60,7 @@ MAKE_HOOK(CBasePlayer_ShouldDrawThisPlayer, S::CBasePlayer_ShouldDrawThisPlayer(
 MAKE_HOOK(CBasePlayer_ShouldDrawLocalPlayer, S::CBasePlayer_ShouldDrawLocalPlayer(), bool,
 	/*void* rcx*/)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CBasePlayer_ShouldDrawLocalPlayer[DEFAULT_BIND])
-		return CALL_ORIGINAL(/*rcx*/);
-#endif
+	DEBUG_RETURN(CBasePlayer_ShouldDrawThisPlayer, /*rcx*/);
 
 	//const auto dwRetAddr = uintptr_t(_ReturnAddress());
 	//const auto dwDesired = S::CBaseCombatWeapon_CalcOverrideModelIndex_ShouldDrawLocalPlayer_Call();
@@ -90,10 +81,7 @@ MAKE_HOOK(CBasePlayer_ShouldDrawLocalPlayer, S::CBasePlayer_ShouldDrawLocalPlaye
 MAKE_HOOK(CBaseCombatWeapon_ShouldDraw, S::CBaseCombatWeapon_ShouldDraw(), bool,
 	void* rcx)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CBaseCombatWeapon_ShouldDraw[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx);
-#endif
+	DEBUG_RETURN(CBaseCombatWeapon_ShouldDraw, rcx);
 
 	if (F::Spectate.HasTarget() && !I::EngineClient->IsHLTV())
 	{
@@ -108,10 +96,7 @@ MAKE_HOOK(CBaseCombatWeapon_ShouldDraw, S::CBaseCombatWeapon_ShouldDraw(), bool,
 MAKE_HOOK(CViewRender_DrawViewModels, S::CViewRender_DrawViewModels(), void,
 	void* rcx, const CViewSetup& viewRender, bool drawViewmodel)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CViewRender_DrawViewModels[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, viewRender, drawViewmodel);
-#endif
+	DEBUG_RETURN(CViewRender_DrawViewModels, rcx, viewRender, drawViewmodel);
 
 	CALL_ORIGINAL(rcx, viewRender, F::Spectate.HasTarget() && !I::EngineClient->IsHLTV() ? false : drawViewmodel);
 }
\ No newline at end of file
diff --git a/Amalgam/src/Hooks/CTFRagdoll_CreateTFRagdoll.cpp b/Amalgam/src/Hooks/CTFRagdoll_CreateTFRagdoll.cpp
index 474628de..521f5f19 100644
--- a/Amalgam/src/Hooks/CTFRagdoll_CreateTFRagdoll.cpp
+++ b/Amalgam/src/Hooks/CTFRagdoll_CreateTFRagdoll.cpp
@@ -5,10 +5,7 @@ MAKE_SIGNATURE(CTFRagdoll_CreateTFRagdoll, "client.dll", "48 89 4C 24 ? 55 53 56
 MAKE_HOOK(CTFRagdoll_CreateTFRagdoll, S::CTFRagdoll_CreateTFRagdoll(), void,
 	void* rcx)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CTFRagdoll_CreateTFRagdoll[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx);
-#endif
+	DEBUG_RETURN(CTFRagdoll_CreateTFRagdoll, rcx);
 
 	if (Vars::Visuals::Removals::Ragdolls.Value)
 		return;
diff --git a/Amalgam/src/Hooks/CTFRocketLauncher_CheckReloadMisfire.cpp b/Amalgam/src/Hooks/CTFRocketLauncher_CheckReloadMisfire.cpp
index 316ab790..ce341819 100644
--- a/Amalgam/src/Hooks/CTFRocketLauncher_CheckReloadMisfire.cpp
+++ b/Amalgam/src/Hooks/CTFRocketLauncher_CheckReloadMisfire.cpp
@@ -6,10 +6,7 @@ MAKE_SIGNATURE(CTFRocketLauncher_FireProjectile, "client.dll", "48 89 74 24 ? 57
 MAKE_HOOK(CTFRocketLauncher_CheckReloadMisfire, S::CTFRocketLauncher_CheckReloadMisfire(), bool,
 	void* rcx)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CTFRocketLauncher_CheckReloadMisfire[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx);
-#endif
+	DEBUG_RETURN(CTFRocketLauncher_CheckReloadMisfire, rcx);
 
 	auto pWeapon = reinterpret_cast<CTFWeaponBase*>(rcx);
 	if (!SDK::AttribHookValue(0, "can_overload", pWeapon))
@@ -40,10 +37,7 @@ MAKE_HOOK(CTFRocketLauncher_CheckReloadMisfire, S::CTFRocketLauncher_CheckReload
 MAKE_HOOK(CTFRocketLauncher_FireProjectile, S::CTFRocketLauncher_FireProjectile(), CBaseEntity*,
 	void* rcx, CTFPlayer* pPlayer)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CTFRocketLauncher_FireProjectile[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, pPlayer);
-#endif
+	DEBUG_RETURN(CTFRocketLauncher_FireProjectile, rcx, pPlayer);
 
 	auto pWeapon = reinterpret_cast<CTFWeaponBase*>(rcx);
 	pWeapon->m_bRemoveable() = false;
@@ -57,10 +51,7 @@ MAKE_SIGNATURE(CTFBat_Wood_LaunchBall, "client.dll", "40 53 48 83 EC ? 48 8B D9
 MAKE_HOOK(CTFBat_Wood_LaunchBall, S::CTFBat_Wood_LaunchBall(), void,
 	void* rcx)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CTFBat_Wood_LaunchBall[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx);
-#endif
+	DEBUG_RETURN(CTFBat_Wood_LaunchBall, rcx);
 
 	auto pWeapon = reinterpret_cast<CTFWeaponBase*>(rcx);
 	pWeapon->CalcIsAttackCritical();
diff --git a/Amalgam/src/Hooks/CTFWeaponBase_CalcIsAttackCritical.cpp b/Amalgam/src/Hooks/CTFWeaponBase_CalcIsAttackCritical.cpp
index 65fced4f..38eb9b22 100644
--- a/Amalgam/src/Hooks/CTFWeaponBase_CalcIsAttackCritical.cpp
+++ b/Amalgam/src/Hooks/CTFWeaponBase_CalcIsAttackCritical.cpp
@@ -7,10 +7,7 @@ static int s_iCurrentSeed = -1;
 MAKE_HOOK(CTFWeaponBase_CalcIsAttackCritical, S::CTFWeaponBase_CalcIsAttackCritical(), void,
 	void* rcx)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CTFWeaponBase_CalcIsAttackCritical[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx);
-#endif
+	DEBUG_RETURN(CTFWeaponBase_CalcIsAttackCritical, rcx);
 
 	auto pWeapon = reinterpret_cast<CTFWeaponBase*>(rcx);
 
diff --git a/Amalgam/src/Hooks/CTFWeaponBase_CanFireRandomCriticalShot.cpp b/Amalgam/src/Hooks/CTFWeaponBase_CanFireRandomCriticalShot.cpp
index 549968a6..b3aaf0ab 100644
--- a/Amalgam/src/Hooks/CTFWeaponBase_CanFireRandomCriticalShot.cpp
+++ b/Amalgam/src/Hooks/CTFWeaponBase_CanFireRandomCriticalShot.cpp
@@ -7,10 +7,7 @@ MAKE_SIGNATURE(CTFWeaponBase_CanFireRandomCriticalShot, "client.dll", "F3 0F 58
 MAKE_HOOK(CTFWeaponBase_CanFireRandomCriticalShot, S::CTFWeaponBase_CanFireRandomCriticalShot(), bool,
 	void* rcx, float flCritChance)
 {	// not present on the client so it will always be a crit behind otherwise
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CTFWeaponBase_CanFireRandomCriticalShot[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, flCritChance);
-#endif
+	DEBUG_RETURN(CTFWeaponBase_CanFireRandomCriticalShot, rcx, flCritChance);
 
 	int nRandomRangedCritDamage = F::CritHack.GetCritDamage();
 	int nTotalDamage = F::CritHack.GetRangedDamage();
diff --git a/Amalgam/src/Hooks/CTFWeaponBase_GetShootSound.cpp b/Amalgam/src/Hooks/CTFWeaponBase_GetShootSound.cpp
index 4879bead..6cdc4421 100644
--- a/Amalgam/src/Hooks/CTFWeaponBase_GetShootSound.cpp
+++ b/Amalgam/src/Hooks/CTFWeaponBase_GetShootSound.cpp
@@ -5,10 +5,7 @@ MAKE_SIGNATURE(CTFWeaponBase_GetShootSound, "client.dll", "40 55 56 41 56 48 83
 MAKE_HOOK(CTFWeaponBase_GetShootSound, S::CTFWeaponBase_GetShootSound(), const char*,
 	void* rcx, int iIndex)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CTFWeaponBase_GetShootSound[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, iIndex);
-#endif
+	DEBUG_RETURN(CTFWeaponBase_GetShootSound, rcx, iIndex);
 
 	if (Vars::Misc::Sound::GiantWeaponSounds.Value)
 	{
diff --git a/Amalgam/src/Hooks/CThirdPersonManager_Update.cpp b/Amalgam/src/Hooks/CThirdPersonManager_Update.cpp
index 6c91ed40..448db6bf 100644
--- a/Amalgam/src/Hooks/CThirdPersonManager_Update.cpp
+++ b/Amalgam/src/Hooks/CThirdPersonManager_Update.cpp
@@ -5,8 +5,5 @@ MAKE_SIGNATURE(CThirdPersonManager_Update, "client.dll", "40 53 48 83 EC ? 48 8B
 MAKE_HOOK(CThirdPersonManager_Update, S::CThirdPersonManager_Update(), void,
 	void* rcx)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CThirdPersonManager_Update[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx);
-#endif
+	DEBUG_RETURN(CThirdPersonManager_Update, rcx);
 }
\ No newline at end of file
diff --git a/Amalgam/src/Hooks/CViewRender_DrawUnderwaterOverlay.cpp b/Amalgam/src/Hooks/CViewRender_DrawUnderwaterOverlay.cpp
index 6d835cf6..cc7bcb04 100644
--- a/Amalgam/src/Hooks/CViewRender_DrawUnderwaterOverlay.cpp
+++ b/Amalgam/src/Hooks/CViewRender_DrawUnderwaterOverlay.cpp
@@ -5,10 +5,7 @@ MAKE_SIGNATURE(CViewRender_DrawUnderwaterOverlay, "client.dll", "4C 8B DC 41 56
 MAKE_HOOK(CViewRender_DrawUnderwaterOverlay, S::CViewRender_DrawUnderwaterOverlay(), void,
 	void* rcx)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CViewRender_DrawUnderwaterOverlay[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx);
-#endif
+	DEBUG_RETURN(CViewRender_DrawUnderwaterOverlay, rcx);
 
 	if (!Vars::Visuals::Removals::ScreenOverlays.Value || SDK::CleanScreenshot())
 		CALL_ORIGINAL(rcx);
diff --git a/Amalgam/src/Hooks/CViewRender_LevelInit.cpp b/Amalgam/src/Hooks/CViewRender_LevelInit.cpp
index 64457253..2b675e5f 100644
--- a/Amalgam/src/Hooks/CViewRender_LevelInit.cpp
+++ b/Amalgam/src/Hooks/CViewRender_LevelInit.cpp
@@ -12,10 +12,7 @@
 MAKE_HOOK(CViewRender_LevelInit, U::Memory.GetVirtual(I::ViewRender, 1), void,
 	void* rcx)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CViewRender_LevelInit[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx);
-#endif
+	DEBUG_RETURN(CViewRender_LevelInit, rcx);
 
 	F::Materials.ReloadMaterials();
 	F::Visuals.OverrideWorldTextures();
diff --git a/Amalgam/src/Hooks/CViewRender_PerformScreenOverlay.cpp b/Amalgam/src/Hooks/CViewRender_PerformScreenOverlay.cpp
index fc560685..08e41655 100644
--- a/Amalgam/src/Hooks/CViewRender_PerformScreenOverlay.cpp
+++ b/Amalgam/src/Hooks/CViewRender_PerformScreenOverlay.cpp
@@ -5,10 +5,7 @@ MAKE_SIGNATURE(CViewRender_PerformScreenOverlay, "client.dll", "4C 8B DC 49 89 5
 MAKE_HOOK(CViewRender_PerformScreenOverlay, S::CViewRender_PerformScreenOverlay(), void,
 	void* rcx, int x, int y, int w, int h)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CViewRender_PerformScreenOverlay[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, x, y, w, h);
-#endif
+	DEBUG_RETURN(CViewRender_PerformScreenOverlay, rcx, x, y, w, h);
 
 	if (!Vars::Visuals::Removals::ScreenOverlays.Value || SDK::CleanScreenshot())
 		CALL_ORIGINAL(rcx, x, y, w, h);
diff --git a/Amalgam/src/Hooks/CViewRender_RenderView.cpp b/Amalgam/src/Hooks/CViewRender_RenderView.cpp
index 4f43a8df..4da06847 100644
--- a/Amalgam/src/Hooks/CViewRender_RenderView.cpp
+++ b/Amalgam/src/Hooks/CViewRender_RenderView.cpp
@@ -5,10 +5,7 @@
 MAKE_HOOK(CViewRender_RenderView, U::Memory.GetVirtual(I::ViewRender, 6), void,
 	void* rcx, const CViewSetup& view, ClearFlags_t nClearFlags, RenderViewInfo_t whatToDraw)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CViewRender_RenderView[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, view, nClearFlags, whatToDraw);
-#endif
+	DEBUG_RETURN(CViewRender_RenderView, rcx, view, nClearFlags, whatToDraw);
 
 	CALL_ORIGINAL(rcx, view, nClearFlags, whatToDraw);
 	if (SDK::CleanScreenshot() || G::Unload)
diff --git a/Amalgam/src/Hooks/CWeaponMedigun_PrimaryAttack.cpp b/Amalgam/src/Hooks/CWeaponMedigun_PrimaryAttack.cpp
index 3258af48..aa624c0e 100644
--- a/Amalgam/src/Hooks/CWeaponMedigun_PrimaryAttack.cpp
+++ b/Amalgam/src/Hooks/CWeaponMedigun_PrimaryAttack.cpp
@@ -14,10 +14,7 @@ struct Restore_t
 MAKE_HOOK(CWeaponMedigun_PrimaryAttack, S::CWeaponMedigun_PrimaryAttack(), void,
 	void* rcx)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CWeaponMedigun_PrimaryAttack[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx);
-#endif
+	DEBUG_RETURN(CWeaponMedigun_PrimaryAttack, rcx);
 
 	auto pWeapon = reinterpret_cast<CWeaponMedigun*>(rcx);
 	auto pOwner = pWeapon->m_hOwner()->As<CTFPlayer>();
diff --git a/Amalgam/src/Hooks/Cbuf_ExecuteCommand.cpp b/Amalgam/src/Hooks/Cbuf_ExecuteCommand.cpp
index 726d8a7d..5de3aace 100644
--- a/Amalgam/src/Hooks/Cbuf_ExecuteCommand.cpp
+++ b/Amalgam/src/Hooks/Cbuf_ExecuteCommand.cpp
@@ -214,10 +214,7 @@ static std::vector<std::function<void()>> s_vDynamic = {
 MAKE_HOOK(Cbuf_ExecuteCommand, S::Cbuf_ExecuteCommand(), void,
 	CCommand& args, cmd_source_t source)
 {
-#ifdef DEBUG_HOOKS
-    if (!Vars::Hooks::Cbuf_ExecuteCommand[DEFAULT_BIND])
-        return CALL_ORIGINAL(args, source);
-#endif
+    DEBUG_RETURN(Cbuf_ExecuteCommand, args, source);
 
 	if (args.ArgC())
 	{
diff --git a/Amalgam/src/Hooks/ClientModeTFNormal_BIsFriendOrPartyMember.cpp b/Amalgam/src/Hooks/ClientModeTFNormal_BIsFriendOrPartyMember.cpp
index c0bd3114..e2bd4823 100644
--- a/Amalgam/src/Hooks/ClientModeTFNormal_BIsFriendOrPartyMember.cpp
+++ b/Amalgam/src/Hooks/ClientModeTFNormal_BIsFriendOrPartyMember.cpp
@@ -5,10 +5,7 @@ MAKE_SIGNATURE(CHudInspectPanel_UserCmd_InspectTarget_BIsFriendOrPartyMember_Cal
 MAKE_HOOK(ClientModeTFNormal_BIsFriendOrPartyMember, S::ClientModeTFNormal_BIsFriendOrPartyMember(), bool,
 	void* rcx, CBaseEntity* pEntity)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::ClientModeTFNormal_BIsFriendOrPartyMember[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, pEntity);
-#endif
+	DEBUG_RETURN(ClientModeTFNormal_BIsFriendOrPartyMember, rcx, pEntity);
 
 	const auto dwRetAddr = uintptr_t(_ReturnAddress());
 	const auto dwDesired = S::CHudInspectPanel_UserCmd_InspectTarget_BIsFriendOrPartyMember_Call();
diff --git a/Amalgam/src/Hooks/DSP_Process.cpp b/Amalgam/src/Hooks/DSP_Process.cpp
index 11062ac2..d66f57ab 100644
--- a/Amalgam/src/Hooks/DSP_Process.cpp
+++ b/Amalgam/src/Hooks/DSP_Process.cpp
@@ -5,10 +5,7 @@ MAKE_SIGNATURE(DSP_Process, "engine.dll", "48 89 5C 24 ? 55 41 54 41 57 48 83 EC
 MAKE_HOOK(DSP_Process, S::DSP_Process(), void,
 	unsigned int idsp, int* pbfront, int* pbrear, int* pbcenter, int sampleCount)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::DSP_Process[DEFAULT_BIND])
-		return CALL_ORIGINAL(idsp, pbfront, pbrear, pbcenter, sampleCount);
-#endif
+	DEBUG_RETURN(DSP_Process, idsp, pbfront, pbrear, pbcenter, sampleCount);
 
 	if (!Vars::Misc::Sound::RemoveDSP.Value)
 		CALL_ORIGINAL(idsp, pbfront, pbrear, pbcenter, sampleCount);
diff --git a/Amalgam/src/Hooks/Direct3DDevice9.cpp b/Amalgam/src/Hooks/Direct3DDevice9.cpp
index 9a3924f0..f59b8abb 100644
--- a/Amalgam/src/Hooks/Direct3DDevice9.cpp
+++ b/Amalgam/src/Hooks/Direct3DDevice9.cpp
@@ -9,6 +9,8 @@ extern IMGUI_IMPL_API LRESULT ImGui_ImplWin32_WndProcHandler(HWND hWnd, UINT msg
 MAKE_HOOK(Direct3DDevice9_Present, U::Memory.GetVirtual(I::DirectXDevice, 17), HRESULT,
 	IDirect3DDevice9* pDevice, const RECT* pSource, const RECT* pDestination, const RGNDATA* pDirtyRegion)
 {
+	DEBUG_RETURN(Direct3DDevice9_Present, pDevice, pSource, pDestination, pDirtyRegion);
+
 	if (!G::Unload)
 		F::Render.Render(pDevice);
 
@@ -18,6 +20,8 @@ MAKE_HOOK(Direct3DDevice9_Present, U::Memory.GetVirtual(I::DirectXDevice, 17), H
 MAKE_HOOK(Direct3DDevice9_Reset, U::Memory.GetVirtual(I::DirectXDevice, 16), HRESULT,
 	LPDIRECT3DDEVICE9 pDevice, D3DPRESENT_PARAMETERS* pPresentationParameters)
 {
+	DEBUG_RETURN(Direct3DDevice9_Reset, pDevice, pPresentationParameters);
+
 	ImGui_ImplDX9_InvalidateDeviceObjects();
 	const HRESULT Original = CALL_ORIGINAL(pDevice, pPresentationParameters);
 	ImGui_ImplDX9_CreateDeviceObjects();
@@ -46,6 +50,8 @@ LONG __stdcall WndProc::Func(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 MAKE_HOOK(VGuiSurface_LockCursor, U::Memory.GetVirtual(I::MatSystemSurface, 62), void,
 	void* rcx)
 {
+	DEBUG_RETURN(VGuiSurface_LockCursor, rcx);
+
 	if (F::Menu.m_bIsOpen)
 		return I::MatSystemSurface->UnlockCursor();
 
@@ -55,6 +61,8 @@ MAKE_HOOK(VGuiSurface_LockCursor, U::Memory.GetVirtual(I::MatSystemSurface, 62),
 MAKE_HOOK(VGuiSurface_SetCursor, U::Memory.GetVirtual(I::MatSystemSurface, 51), void,
 	void* rcx, HCursor cursor)
 {
+	DEBUG_RETURN(VGuiSurface_SetCursor, rcx, cursor);
+
 	if (F::Menu.m_bIsOpen)
 	{
 		switch (F::Render.Cursor)
diff --git a/Amalgam/src/Hooks/DoEnginePostProcessing.cpp b/Amalgam/src/Hooks/DoEnginePostProcessing.cpp
index 4a111c4b..0e0dfb3a 100644
--- a/Amalgam/src/Hooks/DoEnginePostProcessing.cpp
+++ b/Amalgam/src/Hooks/DoEnginePostProcessing.cpp
@@ -5,10 +5,7 @@ MAKE_SIGNATURE(DoEnginePostProcessing, "client.dll", "48 8B C4 44 89 48 ? 44 89
 MAKE_HOOK(DoEnginePostProcessing, S::DoEnginePostProcessing(), void,
 	int x, int y, int w, int h, bool bFlashlightIsOn, bool bPostVGui)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::DoEnginePostProcessing[DEFAULT_BIND])
-		return CALL_ORIGINAL(x, y, w, h, bFlashlightIsOn, bPostVGui);
-#endif
+	DEBUG_RETURN(DoEnginePostProcessing, x, y, w, h, bFlashlightIsOn, bPostVGui);
 
 	if (!Vars::Visuals::Removals::PostProcessing.Value || SDK::CleanScreenshot())
 		CALL_ORIGINAL(x, y, w, h, bFlashlightIsOn, bPostVGui);
diff --git a/Amalgam/src/Hooks/FX_FireBullets.cpp b/Amalgam/src/Hooks/FX_FireBullets.cpp
index dd3e8122..f36bf09c 100644
--- a/Amalgam/src/Hooks/FX_FireBullets.cpp
+++ b/Amalgam/src/Hooks/FX_FireBullets.cpp
@@ -10,10 +10,7 @@ MAKE_SIGNATURE(CTFWeaponBaseGun_FireBullet_FireBullets_Call, "client.dll", "0F 2
 MAKE_HOOK(FX_FireBullets, S::FX_FireBullets(), void,
 	CTFWeaponBase* pWpn, int iPlayer, const Vec3& vecOrigin, const Vec3& vecAngles, int iWeapon, int iMode, int iSeed, float flSpread, float flDamage, bool bCritical)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::FX_FireBullets[DEFAULT_BIND])
-		return CALL_ORIGINAL(pWpn, iPlayer, vecOrigin, vecAngles, iWeapon, iMode, iSeed, flSpread, flDamage, bCritical);
-#endif
+	DEBUG_RETURN(FX_FireBullets, pWpn, iPlayer, vecOrigin, vecAngles, iWeapon, iMode, iSeed, flSpread, flDamage, bCritical);
 
 	const auto dwRetAddr = uintptr_t(_ReturnAddress());
 	const auto dwDesired = S::CTFWeaponBaseGun_FireBullet_FireBullets_Call();
@@ -33,10 +30,7 @@ MAKE_SIGNATURE(CBasePlayer_ProcessUsercmds, "server.dll", "40 53 55 56 57 41 54
 MAKE_HOOK(FX_FireBullets_Server, S::FX_FireBullets_Server(), void,
 	CTFWeaponBase* pWpn, int iPlayer, const Vec3& vecOrigin, const Vec3& vecAngles, int iWeapon, int iMode, int iSeed, float flSpread, float flDamage, bool bCritical)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::FX_FireBullets[DEFAULT_BIND])
-		return CALL_ORIGINAL(pWpn, iPlayer, vecOrigin, vecAngles, iWeapon, iMode, iSeed, flSpread, flDamage, bCritical);
-#endif
+	DEBUG_RETURN(FX_FireBullets_Server, pWpn, iPlayer, vecOrigin, vecAngles, iWeapon, iMode, iSeed, flSpread, flDamage, bCritical);
 
 	if (Vars::Aimbot::General::NoSpread.Value)
 		SDK::Output("FX_FireBullets", std::format("{}", iSeed).c_str(), { 0, 255, 0 });
@@ -46,6 +40,8 @@ MAKE_HOOK(FX_FireBullets_Server, S::FX_FireBullets_Server(), void,
 MAKE_HOOK(CBasePlayer_ProcessUsercmds, S::CBasePlayer_ProcessUsercmds(), void,
 	void* rcx, CUserCmd* cmds, int numcmds, int totalcmds, int dropped_packets, bool paused)
 {
+	DEBUG_RETURN(CBasePlayer_ProcessUsercmds, rcx, cmds, numcmds, totalcmds, dropped_packets, paused);
+
 	bool bInAttack = false;
 	for (int i = totalcmds - 1; i >= 0; i--)
 	{
diff --git a/Amalgam/src/Hooks/GetClientInterpAmount.cpp b/Amalgam/src/Hooks/GetClientInterpAmount.cpp
index 0e51208e..2a03a57e 100644
--- a/Amalgam/src/Hooks/GetClientInterpAmount.cpp
+++ b/Amalgam/src/Hooks/GetClientInterpAmount.cpp
@@ -7,10 +7,7 @@ MAKE_SIGNATURE(CNetGraphPanel_DrawTextFields_GetClientInterpAmount_Call2, "clien
 MAKE_HOOK(GetClientInterpAmount, S::GetClientInterpAmount(), float,
 	)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::GetClientInterpAmount[DEFAULT_BIND])
-		return CALL_ORIGINAL();
-#endif
+	DEBUG_RETURN(GetClientInterpAmount);
 
 	if (!Vars::Visuals::Removals::Lerp.Value && !Vars::Visuals::Removals::Interpolation.Value)
 		return CALL_ORIGINAL();
diff --git a/Amalgam/src/Hooks/HostState_Shutdown.cpp b/Amalgam/src/Hooks/HostState_Shutdown.cpp
index 41b02730..69897440 100644
--- a/Amalgam/src/Hooks/HostState_Shutdown.cpp
+++ b/Amalgam/src/Hooks/HostState_Shutdown.cpp
@@ -8,10 +8,7 @@ MAKE_SIGNATURE(HostState_Restart, "engine.dll", "C7 05 ? ? ? ? ? ? ? ? C3 CC CC
 MAKE_HOOK(HostState_Shutdown, S::HostState_Shutdown(), void,
 	)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::HostState_Shutdown[DEFAULT_BIND])
-		return CALL_ORIGINAL();
-#endif
+	DEBUG_RETURN(HostState_Shutdown);
 
 	U::Core.m_bUnload = true;
 	CALL_ORIGINAL();
@@ -20,10 +17,7 @@ MAKE_HOOK(HostState_Shutdown, S::HostState_Shutdown(), void,
 MAKE_HOOK(HostState_Restart, S::HostState_Restart(), void,
 	)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::HostState_Restart[DEFAULT_BIND])
-		return CALL_ORIGINAL();
-#endif
+	DEBUG_RETURN(HostState_Restart);
 
 	U::Core.m_bUnload = true;
 	CALL_ORIGINAL();
diff --git a/Amalgam/src/Hooks/IEngineTrace_SetTraceEntity.cpp b/Amalgam/src/Hooks/IEngineTrace_SetTraceEntity.cpp
index 95edefe9..08a9073a 100644
--- a/Amalgam/src/Hooks/IEngineTrace_SetTraceEntity.cpp
+++ b/Amalgam/src/Hooks/IEngineTrace_SetTraceEntity.cpp
@@ -41,10 +41,7 @@ static bool s_bOriginalStartSolid = false;
 MAKE_HOOK(IEngineTrace_SetTraceEntity, U::Memory.GetVirtual(I::EngineTrace, 20), void,
 	void* rcx, ICollideable* pCollideable, trace_t* pTrace)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::IEngineTrace_SetTraceEntity[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, pCollideable, pTrace);
-#endif
+	DEBUG_RETURN(IEngineTrace_SetTraceEntity, rcx, pCollideable, pTrace);
 
 	const auto dwRetAddr = uintptr_t(_ReturnAddress());
 	const auto dwDesired = S::IEngineTrace_TraceRay_SetTraceEntity_Call();
@@ -58,10 +55,7 @@ MAKE_HOOK(IEngineTrace_SetTraceEntity, U::Memory.GetVirtual(I::EngineTrace, 20),
 MAKE_HOOK(CM_BoxTrace, S::CM_BoxTrace(), void,
 	const Ray_t& ray, int headnode, int brushmask, bool computeEndpt, trace_t& tr)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CM_BoxTrace[DEFAULT_BIND])
-		return CALL_ORIGINAL(ray, headnode, brushmask, computeEndpt, tr);
-#endif
+	DEBUG_RETURN(CM_BoxTrace, ray, headnode, brushmask, computeEndpt, tr);
 
 	CALL_ORIGINAL(ray, headnode, brushmask, computeEndpt, tr);
 
@@ -71,10 +65,7 @@ MAKE_HOOK(CM_BoxTrace, S::CM_BoxTrace(), void,
 MAKE_HOOK(CM_TraceToLeaf_True, S::CM_TraceToLeaf_True(), void,
 	TraceInfo_t* pTraceInfo, int ndxLeaf, float startFrac, float endFrac)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CM_TraceToLeaf_True[DEFAULT_BIND])
-		return CALL_ORIGINAL(pTraceInfo, ndxLeaf, startFrac, endFrac);
-#endif
+	DEBUG_RETURN(CM_TraceToLeaf_True, pTraceInfo, ndxLeaf, startFrac, endFrac);
 
 	if (pTraceInfo->m_contents & CONTENTS_NOSTARTSOLID)
 	{
@@ -91,10 +82,7 @@ MAKE_HOOK(CM_TraceToLeaf_True, S::CM_TraceToLeaf_True(), void,
 MAKE_HOOK(CM_TraceToLeaf_False, S::CM_TraceToLeaf_False(), void,
 	TraceInfo_t* pTraceInfo, int ndxLeaf, float startFrac, float endFrac)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CM_TraceToLeaf_False[DEFAULT_BIND])
-		return CALL_ORIGINAL(pTraceInfo, ndxLeaf, startFrac, endFrac);
-#endif
+	DEBUG_RETURN(CM_TraceToLeaf_False, pTraceInfo, ndxLeaf, startFrac, endFrac);
 
 	if (pTraceInfo->m_contents & CONTENTS_NOSTARTSOLID)
 	{
@@ -111,10 +99,7 @@ MAKE_HOOK(CM_TraceToLeaf_False, S::CM_TraceToLeaf_False(), void,
 MAKE_HOOK(CM_ClipBoxToBrush_True, S::CM_ClipBoxToBrush_True(), void,
 	TraceInfo_t* pTraceInfo, void* brush)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CM_ClipBoxToBrush_True[DEFAULT_BIND])
-		return CALL_ORIGINAL(pTraceInfo, brush);
-#endif
+	DEBUG_RETURN(CM_ClipBoxToBrush_True, pTraceInfo, brush);
 
 	CALL_ORIGINAL(pTraceInfo, brush);
 
@@ -128,10 +113,7 @@ MAKE_HOOK(CM_ClipBoxToBrush_True, S::CM_ClipBoxToBrush_True(), void,
 MAKE_HOOK(CM_ClipBoxToBrush_False, S::CM_ClipBoxToBrush_False(), void,
 	TraceInfo_t* pTraceInfo, void* brush)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CM_ClipBoxToBrush_False[DEFAULT_BIND])
-		return CALL_ORIGINAL(pTraceInfo, brush);
-#endif
+	DEBUG_RETURN(CM_ClipBoxToBrush_False, pTraceInfo, brush);
 
 	CALL_ORIGINAL(pTraceInfo, brush);
 
diff --git a/Amalgam/src/Hooks/IEngineTrace_TraceRay.cpp b/Amalgam/src/Hooks/IEngineTrace_TraceRay.cpp
index 14fa47d4..5539621b 100644
--- a/Amalgam/src/Hooks/IEngineTrace_TraceRay.cpp
+++ b/Amalgam/src/Hooks/IEngineTrace_TraceRay.cpp
@@ -4,10 +4,7 @@
 MAKE_HOOK(IEngineTrace_TraceRay, U::Memory.GetVirtual(I::EngineTrace, 4), void,
 	void* rcx, const Ray_t& ray, unsigned int fMask, ITraceFilter* pTraceFilter, trace_t* pTrace)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::IEngineTrace_TraceRay[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, ray, fMask, pTraceFilter, pTrace);
-#endif
+	DEBUG_RETURN(IEngineTrace_TraceRay, rcx, ray, fMask, pTraceFilter, pTrace);
 
 	CALL_ORIGINAL(rcx, ray, fMask, pTraceFilter, pTrace);
 	if (Vars::Debug::VisualizeTraces.Value)
diff --git a/Amalgam/src/Hooks/IEngineVGui_Paint.cpp b/Amalgam/src/Hooks/IEngineVGui_Paint.cpp
index 3480ad70..6e731a05 100644
--- a/Amalgam/src/Hooks/IEngineVGui_Paint.cpp
+++ b/Amalgam/src/Hooks/IEngineVGui_Paint.cpp
@@ -17,10 +17,7 @@
 MAKE_HOOK(IEngineVGui_Paint, U::Memory.GetVirtual(I::EngineVGui, 14), void,
 	void* rcx, int iMode)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::IEngineVGui_Paint[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, iMode);
-#endif
+	DEBUG_RETURN(IEngineVGui_Paint, rcx, iMode);
 
 	if (G::Unload)
 		return CALL_ORIGINAL(rcx, iMode);
diff --git a/Amalgam/src/Hooks/IMatSystemSurface_OnScreenSizeChanged.cpp b/Amalgam/src/Hooks/IMatSystemSurface_OnScreenSizeChanged.cpp
index 723eafee..74c8c69b 100644
--- a/Amalgam/src/Hooks/IMatSystemSurface_OnScreenSizeChanged.cpp
+++ b/Amalgam/src/Hooks/IMatSystemSurface_OnScreenSizeChanged.cpp
@@ -5,10 +5,7 @@
 MAKE_HOOK(IMatSystemSurface_OnScreenSizeChanged, U::Memory.GetVirtual(I::MatSystemSurface, 111), void,
 	void* rcx, int nOldWidth, int nOldHeight)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::IMatSystemSurface_OnScreenSizeChanged[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, nOldWidth, nOldHeight);
-#endif
+	DEBUG_RETURN(IMatSystemSurface_OnScreenSizeChanged, rcx, nOldWidth, nOldHeight);
 
 	CALL_ORIGINAL(rcx, nOldWidth, nOldHeight);
 
diff --git a/Amalgam/src/Hooks/IMaterialSystem_FindTexture.cpp b/Amalgam/src/Hooks/IMaterialSystem_FindTexture.cpp
index 70f2fe6a..d04c9bca 100644
--- a/Amalgam/src/Hooks/IMaterialSystem_FindTexture.cpp
+++ b/Amalgam/src/Hooks/IMaterialSystem_FindTexture.cpp
@@ -3,10 +3,7 @@
 MAKE_HOOK(IMaterialSystem_FindTexture, U::Memory.GetVirtual(I::MaterialSystem, 79), ITexture*,
 	void* rcx, char const* pTextureName, const char* pTextureGroupName, bool complain, int nAdditionalCreationFlags)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::IMaterialSystem_FindTexture[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, pTextureName, pTextureGroupName, complain, nAdditionalCreationFlags);
-#endif
+	DEBUG_RETURN(IMaterialSystem_FindTexture, rcx, pTextureName, pTextureGroupName, complain, nAdditionalCreationFlags);
 
 	auto pReturn = CALL_ORIGINAL(rcx, pTextureName, pTextureGroupName, complain, nAdditionalCreationFlags);
 
diff --git a/Amalgam/src/Hooks/IPanel_PaintTraverse.cpp b/Amalgam/src/Hooks/IPanel_PaintTraverse.cpp
index 7b5aea96..7451b183 100644
--- a/Amalgam/src/Hooks/IPanel_PaintTraverse.cpp
+++ b/Amalgam/src/Hooks/IPanel_PaintTraverse.cpp
@@ -3,10 +3,7 @@
 MAKE_HOOK(IPanel_PaintTraverse, U::Memory.GetVirtual(I::Panel, 41), void,
 	void* rcx, VPANEL vguiPanel, bool forceRepaint, bool allowForce)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::IPanel_PaintTraverse[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, vguiPanel, forceRepaint, allowForce);
-#endif
+	DEBUG_RETURN(IPanel_PaintTraverse, rcx, vguiPanel, forceRepaint, allowForce);
 
 	if (!Vars::Visuals::UI::StreamerMode.Value)
 		return CALL_ORIGINAL(rcx, vguiPanel, forceRepaint, allowForce);
diff --git a/Amalgam/src/Hooks/ISteamFriends_GetFriendPersonaName.cpp b/Amalgam/src/Hooks/ISteamFriends_GetFriendPersonaName.cpp
index 13b85b25..a1fa00f3 100644
--- a/Amalgam/src/Hooks/ISteamFriends_GetFriendPersonaName.cpp
+++ b/Amalgam/src/Hooks/ISteamFriends_GetFriendPersonaName.cpp
@@ -7,10 +7,7 @@ MAKE_SIGNATURE(GetPlayerNameForSteamID_GetFriendPersonaName_Call, "client.dll",
 MAKE_HOOK(ISteamFriends_GetFriendPersonaName, U::Memory.GetVirtual(I::SteamFriends, 7), const char*,
 	void* rcx, CSteamID steamIDFriend)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::ISteamFriends_GetFriendPersonaName[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, steamIDFriend);
-#endif
+	DEBUG_RETURN(ISteamFriends_GetFriendPersonaName, rcx, steamIDFriend);
 
 	const auto dwRetAddr = uintptr_t(_ReturnAddress());
 	const auto dwDesired = S::GetPlayerNameForSteamID_GetFriendPersonaName_Call();
diff --git a/Amalgam/src/Hooks/ISteamNetworkingUtils_GetPingToDataCenter.cpp b/Amalgam/src/Hooks/ISteamNetworkingUtils_GetPingToDataCenter.cpp
index e3af12a6..f07c6a3f 100644
--- a/Amalgam/src/Hooks/ISteamNetworkingUtils_GetPingToDataCenter.cpp
+++ b/Amalgam/src/Hooks/ISteamNetworkingUtils_GetPingToDataCenter.cpp
@@ -54,10 +54,7 @@ static inline int GetDatacenter(uint32_t uHash)
 MAKE_HOOK(ISteamNetworkingUtils_GetPingToDataCenter, U::Memory.GetVirtual(I::SteamNetworkingUtils, 8), int,
 	void* rcx, SteamNetworkingPOPID popID, SteamNetworkingPOPID* pViaRelayPoP)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::ISteamNetworkingUtils_GetPingToDataCenter[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, popID, pViaRelayPoP);
-#endif
+	DEBUG_RETURN(ISteamNetworkingUtils_GetPingToDataCenter, rcx, popID, pViaRelayPoP);
 
 	int iReturn = CALL_ORIGINAL(rcx, popID, pViaRelayPoP);
 	if (!Vars::Misc::Queueing::ForceRegions.Value || iReturn < 0)
@@ -74,10 +71,7 @@ MAKE_HOOK(ISteamNetworkingUtils_GetPingToDataCenter, U::Memory.GetVirtual(I::Ste
 MAKE_HOOK(CTFPartyClient_RequestQueueForMatch, S::CTFPartyClient_RequestQueueForMatch(), void,
 	void* rcx, int eMatchGroup)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CTFPartyClient_RequestQueueForMatch[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, eMatchGroup);
-#endif
+	DEBUG_RETURN(CTFPartyClient_RequestQueueForMatch, rcx, eMatchGroup);
 
 	I::TFGCClientSystem->SetPendingPingRefresh(true);
 	I::TFGCClientSystem->PingThink();
diff --git a/Amalgam/src/Hooks/IVModelRender_DrawModelExecute.cpp b/Amalgam/src/Hooks/IVModelRender_DrawModelExecute.cpp
index d3dd4ced..1401a3e9 100644
--- a/Amalgam/src/Hooks/IVModelRender_DrawModelExecute.cpp
+++ b/Amalgam/src/Hooks/IVModelRender_DrawModelExecute.cpp
@@ -12,10 +12,7 @@ MAKE_SIGNATURE(CBaseAnimating_InternalDrawModel, "client.dll", "48 8B C4 55 56 4
 MAKE_HOOK(IVModelRender_DrawModelExecute, U::Memory.GetVirtual(I::ModelRender, 19), void,
 	void* rcx, const DrawModelState_t& pState, const ModelRenderInfo_t& pInfo, matrix3x4* pBoneToWorld)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::IVModelRender_DrawModelExecute[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, pState, pInfo, pBoneToWorld);
-#endif
+	DEBUG_RETURN(IVModelRender_DrawModelExecute, rcx, pState, pInfo, pBoneToWorld);
 
 	if (I::EngineVGui->IsGameUIVisible() || SDK::CleanScreenshot()
 		|| F::CameraWindow.m_bDrawing || !F::Materials.m_bLoaded || G::Unload)
@@ -46,10 +43,7 @@ static bool s_bDrawingViewmodel = false;
 MAKE_HOOK(CBaseAnimating_DrawModel, S::CBaseAnimating_DrawModel(), int,
 	void* rcx, int flags)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CBaseAnimating_DrawModel[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, flags);
-#endif
+	DEBUG_RETURN(CBaseAnimating_DrawModel, rcx, flags);
 
 	const auto dwRetAddr = uintptr_t(_ReturnAddress());
 	const auto dwDesired = S::CEconEntity_DrawOverriddenViewmodel_DrawModel_Call();
@@ -67,10 +61,7 @@ MAKE_HOOK(CBaseAnimating_DrawModel, S::CBaseAnimating_DrawModel(), int,
 MAKE_HOOK(CBaseAnimating_InternalDrawModel, S::CBaseAnimating_InternalDrawModel(), int,
 	void* rcx, int flags)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CBaseAnimating_InternalDrawModel[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, flags);
-#endif
+	DEBUG_RETURN(CBaseAnimating_InternalDrawModel, rcx, flags);
 
 	if (!s_bDrawingViewmodel || !(flags & STUDIO_RENDER))
 		return CALL_ORIGINAL(rcx, flags);
diff --git a/Amalgam/src/Hooks/IVModelRender_ForcedMaterialOverride.cpp b/Amalgam/src/Hooks/IVModelRender_ForcedMaterialOverride.cpp
index 658d42aa..a48acea4 100644
--- a/Amalgam/src/Hooks/IVModelRender_ForcedMaterialOverride.cpp
+++ b/Amalgam/src/Hooks/IVModelRender_ForcedMaterialOverride.cpp
@@ -7,10 +7,7 @@
 MAKE_HOOK(IVModelRender_ForcedMaterialOverride, U::Memory.GetVirtual(I::ModelRender, 1), void,
 	IVModelRender* rcx, IMaterial* mat, OverrideType_t type)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::IVModelRender_ForcedMaterialOverride[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, mat, type);
-#endif
+	DEBUG_RETURN(IVModelRender_ForcedMaterialOverride, rcx, mat, type);
 
 	if (F::Chams.m_bRendering || F::Glow.m_bRendering)
 		return;
diff --git a/Amalgam/src/Hooks/NotificationQueue_Add.cpp b/Amalgam/src/Hooks/NotificationQueue_Add.cpp
index ba05fa85..f01001b0 100644
--- a/Amalgam/src/Hooks/NotificationQueue_Add.cpp
+++ b/Amalgam/src/Hooks/NotificationQueue_Add.cpp
@@ -5,10 +5,7 @@ MAKE_SIGNATURE(NotificationQueue_Add, "client.dll", "48 89 5C 24 ? 57 48 83 EC ?
 MAKE_HOOK(NotificationQueue_Add, S::NotificationQueue_Add(), int,
 	CEconNotification* pNotification)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::NotificationQueue_Add[DEFAULT_BIND])
-		return CALL_ORIGINAL(pNotification);
-#endif
+	DEBUG_RETURN(NotificationQueue_Add, pNotification);
 
 	if (Vars::Misc::Automation::AcceptItemDrops.Value && FNV1A::Hash32(pNotification->m_pText) == FNV1A::Hash32Const("TF_HasNewItems"))
 	{
diff --git a/Amalgam/src/Hooks/R_DrawSkyBox.cpp b/Amalgam/src/Hooks/R_DrawSkyBox.cpp
index 8cd7294a..d9b0efa8 100644
--- a/Amalgam/src/Hooks/R_DrawSkyBox.cpp
+++ b/Amalgam/src/Hooks/R_DrawSkyBox.cpp
@@ -5,10 +5,7 @@ MAKE_SIGNATURE(R_DrawSkyBox, "engine.dll", "48 8B C4 55 53 41 54 41 55", 0x0);
 MAKE_HOOK(R_DrawSkyBox, S::R_DrawSkyBox(), void,
 	float zFar, int nDrawFlags)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::R_DrawSkyBox[DEFAULT_BIND])
-		return CALL_ORIGINAL(zFar, nDrawFlags);
-#endif
+	DEBUG_RETURN(R_DrawSkyBox, zFar, nDrawFlags);
 
 	if (FNV1A::Hash32(Vars::Visuals::World::SkyboxChanger.Value.c_str()) == FNV1A::Hash32Const("Off") || SDK::CleanScreenshot())
 		return CALL_ORIGINAL(zFar, nDrawFlags);
diff --git a/Amalgam/src/Hooks/RecvProxy_SimulationTime.cpp b/Amalgam/src/Hooks/RecvProxy_SimulationTime.cpp
index 6605e795..eb1c2276 100644
--- a/Amalgam/src/Hooks/RecvProxy_SimulationTime.cpp
+++ b/Amalgam/src/Hooks/RecvProxy_SimulationTime.cpp
@@ -12,10 +12,7 @@ static inline int GetNetworkBase(int nTick, int nEntity)
 MAKE_HOOK(RecvProxy_SimulationTime, S::RecvProxy_SimulationTime(), void,
 	const CRecvProxyData* pData, void* pStruct, void* pOut)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::RecvProxy_SimulationTime[DEFAULT_BIND])
-		return CALL_ORIGINAL(pData, pStruct, pOut);
-#endif
+	DEBUG_RETURN(RecvProxy_SimulationTime, pData, pStruct, pOut);
 
 	auto pEntity = reinterpret_cast<CBaseEntity*>(pStruct);
 	if (!pEntity || !pEntity->IsPlayer() || pEntity->entindex() == I::EngineClient->GetLocalPlayer())
diff --git a/Amalgam/src/Hooks/TF_IsHolidayActive.cpp b/Amalgam/src/Hooks/TF_IsHolidayActive.cpp
index 8d22c244..e9cfccab 100644
--- a/Amalgam/src/Hooks/TF_IsHolidayActive.cpp
+++ b/Amalgam/src/Hooks/TF_IsHolidayActive.cpp
@@ -23,10 +23,7 @@ MAKE_SIGNATURE(CTFPlayer_FireEvent_IsHolidayActive_Call, "client.dll", "84 C0 74
 MAKE_HOOK(TF_IsHolidayActive, S::TF_IsHolidayActive(), bool,
 	int eHoliday)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::TF_IsHolidayActive[DEFAULT_BIND])
-		return CALL_ORIGINAL(eHoliday);
-#endif
+	DEBUG_RETURN(TF_IsHolidayActive, eHoliday);
 
 	const auto dwRetAddr = uintptr_t(_ReturnAddress());
 	const auto dwDesired = S::CTFPlayer_FireEvent_IsHolidayActive_Call();
diff --git a/Amalgam/src/Hooks/VGuiMenuBuilder_AddMenuItem.cpp b/Amalgam/src/Hooks/VGuiMenuBuilder_AddMenuItem.cpp
index 9a6bf1c7..ec50d154 100644
--- a/Amalgam/src/Hooks/VGuiMenuBuilder_AddMenuItem.cpp
+++ b/Amalgam/src/Hooks/VGuiMenuBuilder_AddMenuItem.cpp
@@ -18,10 +18,7 @@ static const char* s_sPlayerName;
 MAKE_HOOK(CPlayerResource_IsFakePlayer, S::CPlayerResource_IsFakePlayer(), bool,
 	void* rcx, int index)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CPlayerResource_IsFakePlayer[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, index);
-#endif
+	DEBUG_RETURN(CPlayerResource_IsFakePlayer, rcx, index);
 
 	const auto dwRetAddr = uintptr_t(_ReturnAddress());
 	const auto dwDesired = S::CTFClientScoreBoardDialog_OnScoreBoardMouseRightRelease_IsFakePlayer_Call();
@@ -35,10 +32,7 @@ MAKE_HOOK(CPlayerResource_IsFakePlayer, S::CPlayerResource_IsFakePlayer(), bool,
 MAKE_HOOK(VGuiMenuBuilder_AddMenuItem, S::VGuiMenuBuilder_AddMenuItem(), void*,
 	void* rcx, const char* pszButtonText, const char* pszCommand, const char* pszCategoryName)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::VGuiMenuBuilder_AddMenuItem[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, pszButtonText, pszCommand, pszCategoryName);
-#endif
+	DEBUG_RETURN(VGuiMenuBuilder_AddMenuItem, rcx, pszButtonText, pszCommand, pszCategoryName);
 
 	const auto dwRetAddr = uintptr_t(_ReturnAddress());
 	const auto dwDesired1 = S::CTFClientScoreBoardDialog_OnScoreBoardMouseRightRelease_AddMenuItem_CallProfile();
@@ -81,10 +75,7 @@ MAKE_HOOK(VGuiMenuBuilder_AddMenuItem, S::VGuiMenuBuilder_AddMenuItem(), void*,
 MAKE_HOOK(CTFClientScoreBoardDialog_OnCommand, S::CTFClientScoreBoardDialog_OnCommand(), void,
 	void* rcx, const char* command)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::CTFClientScoreBoardDialog_OnCommand[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, command);
-#endif
+	DEBUG_RETURN(CTFClientScoreBoardDialog_OnCommand, rcx, command);
 
 	if (!Vars::Visuals::UI::ScoreboardUtility.Value && !command)
 		return CALL_ORIGINAL(rcx, command);
diff --git a/Amalgam/src/Hooks/bf_read_ReadString.cpp b/Amalgam/src/Hooks/bf_read_ReadString.cpp
index e505bdd8..851dc2e3 100644
--- a/Amalgam/src/Hooks/bf_read_ReadString.cpp
+++ b/Amalgam/src/Hooks/bf_read_ReadString.cpp
@@ -8,10 +8,7 @@ MAKE_SIGNATURE(CHudVote_MsgFunc_VoteStart_ReadString_Call, "client.dll", "8B 4B
 MAKE_HOOK(bf_read_ReadString, S::bf_read_ReadString(), bool,
 	void* rcx, char* pStr, int maxLen, bool bLine, int* pOutNumChars)
 {
-#ifdef DEBUG_HOOKS
-	if (!Vars::Hooks::bf_read_ReadString[DEFAULT_BIND])
-		return CALL_ORIGINAL(rcx, pStr, maxLen, bLine, pOutNumChars);
-#endif
+	DEBUG_RETURN(bf_read_ReadString, rcx, pStr, maxLen, bLine, pOutNumChars);
 
 	const auto dwRetAddr = uintptr_t(_ReturnAddress());
 	const auto dwDesired = S::CHudVote_MsgFunc_VoteStart_ReadString_Call();
diff --git a/Amalgam/src/SDK/Vars.h b/Amalgam/src/SDK/Vars.h
index fe4c361b..54ebd2a6 100644
--- a/Amalgam/src/SDK/Vars.h
+++ b/Amalgam/src/SDK/Vars.h
@@ -881,160 +881,4 @@ namespace Vars
 #endif
 	NAMESPACE_END(Debug);
 
-#ifdef DEBUG_HOOKS
-	NAMESPACE_BEGIN(Hooks)
-		CVar(bf_read_ReadString, "bf_read_ReadString", true, NOSAVE | DEBUGVAR);
-		CVar(CAchievementMgr_CheckAchievementsEnabled, "CAchievementMgr_CheckAchievementsEnabled", true, NOSAVE | DEBUGVAR);
-		CVar(CAttributeManager_AttribHookInt, "CAttributeManager_AttribHookInt", true, NOSAVE | DEBUGVAR);
-		CVar(CAvatarImagePanel_SetPlayer, "CAvatarImagePanel_SetPlayer", true, NOSAVE | DEBUGVAR);
-		CVar(CAvatarImage_SetAvatarSteamID, "CAvatarImage_SetAvatarSteamID", true, NOSAVE | DEBUGVAR);
-		CVar(CBaseAnimating_DrawModel, "CBaseAnimating_DrawModel", true, NOSAVE | DEBUGVAR);
-		CVar(CBaseAnimating_DrawServerHitboxes, "CBaseAnimating_DrawServerHitboxes", true, NOSAVE | DEBUGVAR);
-		CVar(CBaseAnimating_InternalDrawModel, "CBaseAnimating_InternalDrawModel", true, NOSAVE | DEBUGVAR);
-		CVar(CBaseAnimating_Interpolate, "CBaseAnimating_Interpolate", true, NOSAVE | DEBUGVAR);
-		CVar(CBaseAnimating_MaintainSequenceTransitions, "CBaseAnimating_MaintainSequenceTransitions", true, NOSAVE | DEBUGVAR);
-		CVar(CBaseAnimating_SetSequence, "CBaseAnimating_SetSequence", true, NOSAVE | DEBUGVAR);
-		CVar(CBaseAnimating_SetupBones, "CBaseAnimating_SetupBones", true, NOSAVE | DEBUGVAR);
-		CVar(CBaseAnimating_UpdateClientSideAnimation, "CBaseAnimating_UpdateClientSideAnimation", true, NOSAVE | DEBUGVAR);
-		CVar(CBaseCombatWeapon_ShouldDraw, "CBaseCombatWeapon_ShouldDraw", true, NOSAVE | DEBUGVAR);
-		CVar(CBaseEntity_BaseInterpolatePart1, "CBaseEntity_BaseInterpolatePart1", true, NOSAVE | DEBUGVAR);
-		CVar(CBaseEntity_EstimateAbsVelocity, "CBaseEntity_EstimateAbsVelocity", true, NOSAVE | DEBUGVAR);
-		CVar(CBaseEntity_ResetLatched, "CBaseEntity_ResetLatched", true, NOSAVE | DEBUGVAR);
-		CVar(CBaseEntity_SetAbsVelocity, "CBaseEntity_SetAbsVelocity", true, NOSAVE | DEBUGVAR);
-		CVar(CBaseEntity_WorldSpaceCenter, "CBaseEntity_WorldSpaceCenter", true, NOSAVE | DEBUGVAR);
-		CVar(CBaseHudChatLine_InsertAndColorizeText, "CBaseHudChatLine_InsertAndColorizeText", true, NOSAVE | DEBUGVAR);
-		CVar(CBasePlayer_CalcObserverView, "CBasePlayer_CalcObserverView", true, NOSAVE | DEBUGVAR);
-		CVar(CBasePlayer_CalcView, "CBasePlayer_CalcView", true, NOSAVE | DEBUGVAR);
-		CVar(CBasePlayer_CalcViewModelView, "CBasePlayer_CalcViewModelView", true, NOSAVE | DEBUGVAR);
-		CVar(CBasePlayer_EyePosition, "CBasePlayer_EyePosition", true, NOSAVE | DEBUGVAR);
-		CVar(CBasePlayer_ItemPostFrame, "CBasePlayer_ItemPostFrame", true, NOSAVE | DEBUGVAR);
-		CVar(CBasePlayer_ShouldDrawLocalPlayer, "CBasePlayer_ShouldDrawLocalPlayer", true, NOSAVE | DEBUGVAR);
-		CVar(CBasePlayer_ShouldDrawThisPlayer, "CBasePlayer_ShouldDrawThisPlayer", true, NOSAVE | DEBUGVAR);
-		CVar(CBaseViewModel_CalcViewModelView, "CBaseViewModel_CalcViewModelView", true, NOSAVE | DEBUGVAR);
-		CVar(CBaseViewModel_ShouldFlipViewModel, "CBaseViewModel_ShouldFlipViewModel", true, NOSAVE | DEBUGVAR);
-		CVar(Cbuf_ExecuteCommand, "Cbuf_ExecuteCommand", true, NOSAVE | DEBUGVAR);
-		CVar(CClientModeShared_DoPostScreenSpaceEffects, "CClientModeShared_DoPostScreenSpaceEffects", true, NOSAVE | DEBUGVAR);
-		CVar(CClientModeShared_OverrideView, "CClientModeShared_OverrideView", true, NOSAVE | DEBUGVAR);
-		CVar(CClientModeShared_ShouldDrawViewModel, "CClientModeShared_ShouldDrawViewModel", true, NOSAVE | DEBUGVAR);
-		CVar(CClientScoreBoardDialog_NeedsUpdate, "CClientScoreBoardDialog_NeedsUpdate", true, NOSAVE | DEBUGVAR);
-		CVar(CClientState_GetClientInterpAmount, "CClientState_GetClientInterpAmount", true, NOSAVE | DEBUGVAR);
-		CVar(CClientState_ProcessFixAngle, "CClientState_ProcessFixAngle", true, NOSAVE | DEBUGVAR);
-		CVar(CHLClient_CreateMove, "CHLClient_CreateMove", true, NOSAVE | DEBUGVAR);
-		CVar(CHLClient_DispatchUserMessage, "CHLClient_DispatchUserMessage", true, NOSAVE | DEBUGVAR);
-		CVar(CHLClient_FrameStageNotify, "CHLClient_FrameStageNotify", true, NOSAVE | DEBUGVAR);
-		CVar(CHLClient_LevelShutdown, "CHLClient_LevelShutdown", true, NOSAVE | DEBUGVAR);
-		CVar(CHLTVCamera_CalcView, "CHLTVCamera_CalcView", true, NOSAVE | DEBUGVAR);
-		CVar(CHLTVCamera_GetMode, "CHLTVCamera_GetMode", true, NOSAVE | DEBUGVAR);
-		CVar(CHLTVCamera_GetPrimaryTarget, "CHLTVCamera_GetPrimaryTarget", true, NOSAVE | DEBUGVAR);
-		CVar(CHudCrosshair_GetDrawPosition, "CHudCrosshair_GetDrawPosition", true, NOSAVE | DEBUGVAR);
-		CVar(CInput_GetUserCmd, "CInput_GetUserCmd", true, NOSAVE | DEBUGVAR);
-		CVar(CInput_ValidateUserCmd, "CInput_ValidateUserCmd", true, NOSAVE | DEBUGVAR);
-		CVar(CInventoryManager_ShowItemsPickedUp, "CInventoryManager_ShowItemsPickedUp", true, NOSAVE | DEBUGVAR);
-		CVar(ClientModeTFNormal_BIsFriendOrPartyMember, "ClientModeTFNormal_BIsFriendOrPartyMember", true, NOSAVE | DEBUGVAR);
-		CVar(CL_CheckForPureServerWhitelist, "CL_CheckForPureServerWhitelist", true, NOSAVE | DEBUGVAR);
-		CVar(CL_Move, "CL_Move", true, NOSAVE | DEBUGVAR);
-		CVar(CL_ProcessPacketEntities, "CL_ProcessPacketEntities", true, NOSAVE | DEBUGVAR);
-		CVar(CL_ReadPackets, "CL_ReadPackets", true, NOSAVE | DEBUGVAR);
-		CVar(CMatchInviteNotification_OnTick, "CMatchInviteNotification_OnTick", true, NOSAVE | DEBUGVAR);
-		CVar(CMaterial_Uncache, "CMaterial_Uncache", true, NOSAVE | DEBUGVAR);
-		CVar(CM_BoxTrace, "CM_BoxTrace", true, NOSAVE | DEBUGVAR);
-		CVar(CM_ClipBoxToBrush_False, "CM_ClipBoxToBrush_False", true, NOSAVE | DEBUGVAR);
-		CVar(CM_ClipBoxToBrush_True, "CM_ClipBoxToBrush_True", true, NOSAVE | DEBUGVAR);
-		CVar(CM_TraceToLeaf_False, "CM_TraceToLeaf_False", true, NOSAVE | DEBUGVAR);
-		CVar(CM_TraceToLeaf_True, "CM_TraceToLeaf_True", true, NOSAVE | DEBUGVAR);
-		CVar(CNetChannel_SendDatagram, "CNetChannel_SendDatagram", true, NOSAVE | DEBUGVAR);
-		CVar(CNetChannel_SendNetMsg, "CNetChannel_SendNetMsg", true, NOSAVE | DEBUGVAR);
-		CVar(COPRenderSprites_Render, "COPRenderSprites_Render", true, NOSAVE | DEBUGVAR);
-		CVar(COPRenderSprites_RenderSpriteCard, "COPRenderSprites_RenderSpriteCard", true, NOSAVE | DEBUGVAR);
-		CVar(COPRenderSprites_RenderTwoSequenceSpriteCard, "COPRenderSprites_RenderTwoSequenceSpriteCard", true, NOSAVE | DEBUGVAR);
-		CVar(CParticleProperty_Create_Name, "CParticleProperty_Create_Name", true, NOSAVE | DEBUGVAR);
-		CVar(CParticleProperty_Create_Point, "CParticleProperty_Create_Point", true, NOSAVE | DEBUGVAR);
-		CVar(CParticleProperty_AddControlPoint_Pointer, "CParticleProperty_AddControlPoint_Pointer", true, NOSAVE | DEBUGVAR);
-		CVar(CPlayerResource_GetPlayerName, "CPlayerResource_GetPlayerName", true, NOSAVE | DEBUGVAR);
-		CVar(CPlayerResource_IsFakePlayer, "CPlayerResource_IsFakePlayer", true, NOSAVE | DEBUGVAR);
-		CVar(CPrediction_RunSimulation, "CPrediction_RunSimulation", true, NOSAVE | DEBUGVAR);
-		CVar(CRendering3dView_EnableWorldFog, "CRendering3dView_EnableWorldFog", true, NOSAVE | DEBUGVAR);
-		CVar(CSkyboxView_Enable3dSkyboxFog, "CSkyboxView_Enable3dSkyboxFog", true, NOSAVE | DEBUGVAR);
-		CVar(CSniperDot_GetRenderingPositions, "CSniperDot_GetRenderingPositions", true, NOSAVE | DEBUGVAR);
-		CVar(CSoundEmitterSystem_EmitSound, "CSoundEmitterSystem_EmitSound", true, NOSAVE | DEBUGVAR);
-		CVar(CStaticPropMgr_ComputePropOpacity, "CStaticPropMgr_ComputePropOpacity", true, NOSAVE | DEBUGVAR);
-		CVar(CStaticPropMgr_DrawStaticProps, "CStaticPropMgr_DrawStaticProps", true, NOSAVE | DEBUGVAR);
-		CVar(CStudioRender_DrawModelStaticProp, "CStudioRender_DrawModelStaticProp", true, NOSAVE | DEBUGVAR);
-		CVar(CStudioRender_SetAlphaModulation, "CStudioRender_SetAlphaModulation", true, NOSAVE | DEBUGVAR);
-		CVar(CStudioRender_SetColorModulation, "CStudioRender_SetColorModulation", true, NOSAVE | DEBUGVAR);
-		CVar(CTFBadgePanel_SetupBadge, "CTFBadgePanel_SetupBadge", true, NOSAVE | DEBUGVAR);
-		//CVar(CTFBat_Wood_LaunchBall, "CTFBat_Wood_LaunchBall", true, NOSAVE | DEBUGVAR);
-		CVar(CTFClientScoreBoardDialog_OnCommand, "CTFClientScoreBoardDialog_OnCommand", true, NOSAVE | DEBUGVAR);
-		CVar(CTFClientScoreBoardDialog_UpdatePlayerAvatar, "CTFClientScoreBoardDialog_UpdatePlayerAvatar", true, NOSAVE | DEBUGVAR);
-		CVar(CTFGCClientSystem_UpdateAssignedLobby, "CTFGCClientSystem_UpdateAssignedLobby", true, NOSAVE | DEBUGVAR);
-		CVar(CTFHudDeathNotice_AddAdditionalMsg, "CTFHudDeathNotice_AddAdditionalMsg", true, NOSAVE | DEBUGVAR);
-		CVar(CTFHudMannVsMachineScoreboard_UpdatePlayerAvatar, "CTFHudMannVsMachineScoreboard_UpdatePlayerAvatar", true, NOSAVE | DEBUGVAR);
-		CVar(CTFHudMatchStatus_UpdatePlayerAvatar, "CTFHudMatchStatus_UpdatePlayerAvatar", true, NOSAVE | DEBUGVAR);
-		CVar(CTFInput_ApplyMouse, "CTFInput_ApplyMouse", true, NOSAVE | DEBUGVAR);
-		CVar(CTFInput_CAM_CapYaw, "CTFInput_CAM_CapYaw", true, NOSAVE | DEBUGVAR);
-		CVar(CTFInventoryManager_GetItemInLoadoutForClass, "CTFInventoryManager_GetItemInLoadoutForClass", true, NOSAVE | DEBUGVAR);
-		CVar(CTFMatchSummary_UpdatePlayerAvatar, "CTFMatchSummary_UpdatePlayerAvatar", true, NOSAVE | DEBUGVAR);
-		CVar(CTFPartyClient_RequestQueueForMatch, "CTFPartyClient_RequestQueueForMatch", true, NOSAVE | DEBUGVAR);
-		CVar(CTFPlayerInventory_GetMaxItemCount, "CTFPlayerInventory_GetMaxItemCount", true, NOSAVE | DEBUGVAR);
-		CVar(CTFPlayerInventory_VerifyChangedLoadoutsAreValid, "CTFPlayerInventory_VerifyChangedLoadoutsAreValid", true, NOSAVE | DEBUGVAR);
-		CVar(CTFPlayerPanel_GetTeam, "CTFPlayerPanel_GetTeam", true, NOSAVE | DEBUGVAR);
-		CVar(CTFPlayerShared_InCond, "CTFPlayerShared_InCond", true, NOSAVE | DEBUGVAR);
-		CVar(CTFPlayerShared_IsPlayerDominated, "CTFPlayerShared_IsPlayerDominated", true, NOSAVE | DEBUGVAR);
-		CVar(CTFPlayerShared_ShouldSuppressPrediction, "CTFPlayerShared_ShouldSuppressPrediction", true, NOSAVE | DEBUGVAR);
-		CVar(CTFPlayer_AvoidPlayers, "CTFPlayer_AvoidPlayers", true, NOSAVE | DEBUGVAR);
-		CVar(CTFPlayer_BRenderAsZombie, "CTFPlayer_BRenderAsZombie", true, NOSAVE | DEBUGVAR);
-		CVar(CTFPlayer_BuildTransformations, "CTFPlayer_BuildTransformations", true, NOSAVE | DEBUGVAR);
-		CVar(CTFPlayer_DoAnimationEvent, "CTFPlayer_DoAnimationEvent", true, NOSAVE | DEBUGVAR);
-		CVar(CTFPlayer_EyeAngles, "CTFPlayer_EyeAngles", true, NOSAVE | DEBUGVAR);
-		CVar(CTFPlayer_FireBullet, "CTFPlayer_FireBullet", true, NOSAVE | DEBUGVAR);
-		CVar(CTFPlayer_GetMinFOV, "CTFPlayer_GetMinFOV", true, NOSAVE | DEBUGVAR);
-		CVar(CTFPlayer_IsPlayerClass, "CTFPlayer_IsPlayerClass", true, NOSAVE | DEBUGVAR);
-		CVar(CTFPlayer_ShouldDraw, "CTFPlayer_ShouldDraw", true, NOSAVE | DEBUGVAR);
-		CVar(CTFPlayer_UpdateStepSound, "CTFPlayer_UpdateStepSound", true, NOSAVE | DEBUGVAR);
-		CVar(CTFRagdoll_CreateTFRagdoll, "CTFRagdoll_CreateTFRagdoll", true, NOSAVE | DEBUGVAR);
-		CVar(CTFRocketLauncher_CheckReloadMisfire, "CTFRocketLauncher_CheckReloadMisfire", true, NOSAVE | DEBUGVAR);
-		CVar(CTFRocketLauncher_FireProjectile, "CTFRocketLauncher_FireProjectile", true, NOSAVE | DEBUGVAR);
-		CVar(CTFTeamStatus_OnTick, "CTFTeamStatus_OnTick", true, NOSAVE | DEBUGVAR);
-		CVar(CTFWeaponBase_CalcIsAttackCritical, "CTFWeaponBase_CalcIsAttackCritical", true, NOSAVE | DEBUGVAR);
-		CVar(CTFWeaponBase_CanFireRandomCriticalShot, "CTFWeaponBase_CanFireRandomCriticalShot", true, NOSAVE | DEBUGVAR);
-		CVar(CTFWeaponBase_GetShootSound, "CTFWeaponBase_GetShootSound", true, NOSAVE | DEBUGVAR);
-		CVar(CThirdPersonManager_Update, "CThirdPersonManager_Update", true, NOSAVE | DEBUGVAR);
-		CVar(CVGui_RunFrame, "CVGui_RunFrame", true, NOSAVE | DEBUGVAR);
-		CVar(CViewRender_DrawUnderwaterOverlay, "CViewRender_DrawUnderwaterOverlay", true, NOSAVE | DEBUGVAR);
-		CVar(CViewRender_DrawViewModels, "CViewRender_DrawViewModels", true, NOSAVE | DEBUGVAR);
-		CVar(CViewRender_LevelInit, "CViewRender_LevelInit", true, NOSAVE | DEBUGVAR);
-		CVar(CViewRender_PerformScreenOverlay, "CViewRender_PerformScreenOverlay", true, NOSAVE | DEBUGVAR);
-		CVar(CViewRender_RenderView, "CViewRender_RenderView", true, NOSAVE | DEBUGVAR);
-		CVar(CWeaponMedigun_PrimaryAttack, "CWeaponMedigun_PrimaryAttack", true, NOSAVE | DEBUGVAR);
-		CVar(DoEnginePostProcessing, "DoEnginePostProcessing", true, NOSAVE | DEBUGVAR);
-		CVar(DSP_Process, "DSP_Process", true, NOSAVE | DEBUGVAR);
-		CVar(FX_FireBullets, "FX_FireBullets", true, NOSAVE | DEBUGVAR);
-		CVar(GenerateEquipRegionConflictMask, "GenerateEquipRegionConflictMask", true, NOSAVE | DEBUGVAR);
-		CVar(GetClientInterpAmount, "GetClientInterpAmount", true, NOSAVE | DEBUGVAR);
-		CVar(HostState_Shutdown, "HostState_Shutdown", true, NOSAVE | DEBUGVAR);
-		CVar(HostState_Restart, "HostState_Restart", true, NOSAVE | DEBUGVAR);
-		CVar(IEngineTrace_SetTraceEntity, "IEngineTrace_SetTraceEntity", true, NOSAVE | DEBUGVAR);
-		CVar(IEngineTrace_TraceRay, "IEngineTrace_TraceRay", true, NOSAVE | DEBUGVAR);
-		CVar(IEngineVGui_Paint, "IEngineVGui_Paint", true, NOSAVE | DEBUGVAR);
-		CVar(IMaterialSystem_FindTexture, "IMaterialSystem_FindTexture", true, NOSAVE | DEBUGVAR);
-		CVar(IMatSystemSurface_OnScreenSizeChanged, "IMatSystemSurface_OnScreenSizeChanged", true, NOSAVE | DEBUGVAR);
-		CVar(IPanel_PaintTraverse, "IPanel_PaintTraverse", true, NOSAVE | DEBUGVAR);
-		CVar(ISteamFriends_GetFriendPersonaName, "ISteamFriends_GetFriendPersonaName", true, NOSAVE | DEBUGVAR);
-		CVar(ISteamNetworkingUtils_GetPingToDataCenter, "ISteamNetworkingUtils_GetPingToDataCenter", true, NOSAVE | DEBUGVAR);
-		CVar(IVEngineClient_ClientCmd_Unrestricted, "IVEngineClient_ClientCmd_Unrestricted", true, NOSAVE | DEBUGVAR);
-		CVar(IVModelRender_DrawModelExecute, "IVModelRender_DrawModelExecute", true, NOSAVE | DEBUGVAR);
-		CVar(IVModelRender_ForcedMaterialOverride, "IVModelRender_ForcedMaterialOverride", true, NOSAVE | DEBUGVAR);
-		CVar(KeyValues_SetInt, "KeyValues_SetInt", true, NOSAVE | DEBUGVAR);
-		CVar(NDebugOverlay_BoxAngles, "NDebugOverlay_BoxAngles", true, NOSAVE | DEBUGVAR);
-		CVar(NotificationQueue_Add, "NotificationQueue_Add", true, NOSAVE | DEBUGVAR);
-		CVar(RecvProxy_SimulationTime, "RecvProxy_SimulationTime", true, NOSAVE | DEBUGVAR);
-		CVar(R_DrawSkyBox, "R_DrawSkyBox", true, NOSAVE | DEBUGVAR);
-		CVar(SectionedListPanel_SetItemFgColor, "SectionedListPanel_SetItemFgColor", true, NOSAVE | DEBUGVAR);
-		//CVar(S_StartDynamicSound, "S_StartDynamicSound", true, NOSAVE | DEBUGVAR);
-		CVar(S_StartSound, "S_StartSound", true, NOSAVE | DEBUGVAR);
-		CVar(TF_IsHolidayActive, "TF_IsHolidayActive", true, NOSAVE | DEBUGVAR);
-		CVar(VGuiMenuBuilder_AddMenuItem, "VGuiMenuBuilder_AddMenuItem", true, NOSAVE | DEBUGVAR);
-		CVar(vgui_Panel_SetBgColor, "vgui_Panel_SetBgColor", true, NOSAVE | DEBUGVAR);
-	NAMESPACE_END(Hooks);
-#endif
 }
\ No newline at end of file
diff --git a/Amalgam/src/Utils/Hooks/Hooks.h b/Amalgam/src/Utils/Hooks/Hooks.h
index 68b3ff71..9ea6f44b 100644
--- a/Amalgam/src/Utils/Hooks/Hooks.h
+++ b/Amalgam/src/Utils/Hooks/Hooks.h
@@ -31,19 +31,46 @@ public:
 	}
 };
 
-#define MAKE_HOOK(name, address, type, ...) \
-namespace Hooks \
-{ \
-	namespace name \
+#ifndef DEBUG_HOOKS
+	#define MAKE_HOOK(name, address, type, ...) \
+	namespace Hooks \
 	{ \
-		void Init(); \
-		inline CHook Hook(#name, Init); \
-		using FN = type(__fastcall*)(__VA_ARGS__); \
-		type __fastcall Func(__VA_ARGS__); \
+		namespace name \
+		{ \
+			void Init(); \
+			inline CHook Hook(#name, Init); \
+			using FN = type(__fastcall*)(__VA_ARGS__); \
+			type __fastcall Func(__VA_ARGS__); \
+		} \
 	} \
-} \
-void Hooks::name::Init() { Hook.Create(reinterpret_cast<void*>(address), Func); } \
-type __fastcall Hooks::name::Func(__VA_ARGS__)
+	void Hooks::name::Init() { Hook.Create(reinterpret_cast<void*>(address), Func); } \
+	type __fastcall Hooks::name::Func(__VA_ARGS__)
+
+	#define DEBUG_RETURN()
+#else
+	#define MAKE_HOOK(name, address, type, ...) \
+	namespace Vars { \
+		namespace Hooks { \
+			inline ConfigVar<bool> name = { true, { #name }, "Vars::Hooks::"#name##"_", "Hooks", NOSAVE | DEBUGVAR }; \
+		} \
+	} \
+	namespace Hooks \
+	{ \
+		namespace name \
+		{ \
+			void Init(); \
+			inline CHook Hook(#name, Init); \
+			using FN = type(__fastcall*)(__VA_ARGS__); \
+			type __fastcall Func(__VA_ARGS__); \
+		} \
+	} \
+	void Hooks::name::Init() { Hook.Create(reinterpret_cast<void*>(address), Func); } \
+	type __fastcall Hooks::name::Func(__VA_ARGS__)
+
+	#define DEBUG_RETURN(hook, ...) \
+		if (!Vars::Hooks::hook[DEFAULT_BIND]) \
+			return CALL_ORIGINAL(__VA_ARGS__);
+#endif
 
 #define CALL_ORIGINAL Hook.As<FN>()