diff --git a/src/engine/client/smooth_time.cpp b/src/engine/client/smooth_time.cpp
index 3d3234f6498..1ddb9778fbb 100644
--- a/src/engine/client/smooth_time.cpp
+++ b/src/engine/client/smooth_time.cpp
@@ -51,7 +51,8 @@ int64_t CSmoothTime::Get(int64_t Now) const
 
 void CSmoothTime::UpdateInt(int64_t Target)
 {
-	if (g_Config.m_ClSmoothPredictionMargin) {
+	if(g_Config.m_ClSmoothPredictionMargin)
+	{
 		int64_t Now = time_get();
 		m_Current = Get(Now) - GetMargin(Now);
 		m_Snap = Now;
diff --git a/src/game/client/components/bindwheel.cpp b/src/game/client/components/bindwheel.cpp
index 8df01c7bdf5..ea68122e0a5 100644
--- a/src/game/client/components/bindwheel.cpp
+++ b/src/game/client/components/bindwheel.cpp
@@ -163,7 +163,7 @@ void CBindWheel::OnRender()
 
 		char aBuf[MAX_BINDWHEEL_DESC];
 		str_format(aBuf, sizeof(aBuf), "%s", m_BindWheelList[i].description);
-		//str_format(aBuf, sizeof(aBuf), "%d -> %d", inv, orgAngle);
+		// str_format(aBuf, sizeof(aBuf), "%d -> %d", inv, orgAngle);
 		float x = Screen.w / 2 + NudgeX - TextRender()->TextWidth(Size, aBuf, -1, -1.0f) * 0.5;
 		float y = Screen.h / 2 + NudgeY;
 		float LineWidth = -1.0f;
@@ -191,7 +191,7 @@ void CBindWheel::OnRender()
 
 void CBindWheel::Binwheel(int Bind)
 {
-	//bindwheel 0 "123456789" "say hey"
+	// bindwheel 0 "123456789" "say hey"
 	Console()->ExecuteLine(m_BindWheelList[Bind].command);
 }
 
@@ -220,4 +220,3 @@ void CBindWheel::ConfigSaveCallback(IConfigManager *pConfigManager, void *pUserD
 		pConfigManager->WriteLine(aBuf);
 	}
 }
-
diff --git a/src/game/client/components/nameplates.cpp b/src/game/client/components/nameplates.cpp
index 9e1dce87ffb..958a5781c06 100644
--- a/src/game/client/components/nameplates.cpp
+++ b/src/game/client/components/nameplates.cpp
@@ -324,7 +324,7 @@ void CNamePlates::OnRender()
 	// this may need to be changed or calculated differently in the future
 	ScreenX0 -= 400;
 	ScreenX1 += 400;
-	//ScreenY0 -= 0;
+	// ScreenY0 -= 0;
 	ScreenY1 += 800;
 
 	for(int i = 0; i < MAX_CLIENTS; i++)
@@ -342,10 +342,10 @@ void CNamePlates::OnRender()
 			// don't render offscreen
 			if(in_range(RenderPos.x, ScreenX0, ScreenX1) && in_range(RenderPos.y, ScreenY0, ScreenY1))
 			{
-                if(!g_Config.m_ClRenderNameplateSpec)
-                {
-                    RenderNameplate(RenderPos, pInfo, 0.4f, true);
-                }
+				if(!g_Config.m_ClRenderNameplateSpec)
+				{
+					RenderNameplate(RenderPos, pInfo, 0.4f, true);
+				}
 			}
 		}
 		if(m_pClient->m_Snap.m_aCharacters[i].m_Active)
diff --git a/src/game/client/components/rainbow.h b/src/game/client/components/rainbow.h
index 450e64071b4..f2c4958c1a3 100644
--- a/src/game/client/components/rainbow.h
+++ b/src/game/client/components/rainbow.h
@@ -5,20 +5,17 @@
 
 class CRainbow : public CComponent
 {
-
-
-
 public:
 	virtual int Sizeof() const override { return sizeof(*this); }
 	virtual void OnRender() override;
-    
-    void TransformColor(unsigned char mode, int tick, CTeeRenderInfo *pinfo); 
-    enum COLORMODE
-    {
-        COLORMODE_RAINBOW = 1,
-        COLORMODE_PULSE,
-        COLORMODE_DARKNESS,
-    };
+
+	void TransformColor(unsigned char mode, int tick, CTeeRenderInfo *pinfo);
+	enum COLORMODE
+	{
+		COLORMODE_RAINBOW = 1,
+		COLORMODE_PULSE,
+		COLORMODE_DARKNESS,
+	};
 };
 
 #endif
diff --git a/src/game/client/components/skinprofiles.cpp b/src/game/client/components/skinprofiles.cpp
index 3cfa3ee2cea..64b67fa98bb 100644
--- a/src/game/client/components/skinprofiles.cpp
+++ b/src/game/client/components/skinprofiles.cpp
@@ -45,9 +45,9 @@ void CSkinProfiles::AddProfile(int BodyColor, int FeetColor, int CountryFlag, in
 {
 	CProfile profile = CProfile(BodyColor, FeetColor, CountryFlag, Emote, pSkinName, pName, pClan);
 
-	//str_copy(profile.SkinName, pSkinName, sizeof(profile.SkinName));
-	//str_copy(profile.Clan, pClan, sizeof(profile.Clan));
-	//str_copy(profile.Name, pName, sizeof(profile.Name));
+	// str_copy(profile.SkinName, pSkinName, sizeof(profile.SkinName));
+	// str_copy(profile.Clan, pClan, sizeof(profile.Clan));
+	// str_copy(profile.Name, pName, sizeof(profile.Name));
 
 	m_Profiles.push_back(profile);
 }
diff --git a/src/game/client/components/skinprofiles.h b/src/game/client/components/skinprofiles.h
index bee7dc6835b..a03b25aea26 100644
--- a/src/game/client/components/skinprofiles.h
+++ b/src/game/client/components/skinprofiles.h
@@ -4,8 +4,8 @@
 #include <engine/console.h>
 #include <engine/keys.h>
 #include <engine/shared/protocol.h>
-#include <vector>
 #include <game/client/component.h>
+#include <vector>
 
 #define PROFILES_FILE "tclient_profiles.cfg"
 
@@ -33,16 +33,16 @@ class CProfile
 
 class CSkinProfiles : public CComponent
 {
-	static void ConAddProfile(IConsole::IResult* pResult, void* pUserData);
+	static void ConAddProfile(IConsole::IResult *pResult, void *pUserData);
 	class IStorage *m_pStorage;
 	IOHANDLE m_ProfilesFile;
 
-	public:
-		std::vector<CProfile> m_Profiles;
-		void AddProfile(int BodyColor, int FeetColor, int CountryFlag, int Emote, const char *pSkinName, const char *pName, const char *pClan);
-		bool SaveProfiles();
-		void WriteLine(const char *pLine);
-		virtual int Sizeof() const override { return sizeof(*this); }
-		virtual void OnInit() override;
+public:
+	std::vector<CProfile> m_Profiles;
+	void AddProfile(int BodyColor, int FeetColor, int CountryFlag, int Emote, const char *pSkinName, const char *pName, const char *pClan);
+	bool SaveProfiles();
+	void WriteLine(const char *pLine);
+	virtual int Sizeof() const override { return sizeof(*this); }
+	virtual void OnInit() override;
 };
 #endif
\ No newline at end of file
diff --git a/src/game/client/components/tater.cpp b/src/game/client/components/tater.cpp
index d34953add27..f865beeb9a2 100644
--- a/src/game/client/components/tater.cpp
+++ b/src/game/client/components/tater.cpp
@@ -122,7 +122,7 @@ void CTater::RandomSkin(void *pUserData)
 
 	// get all skins as a maps
 	const std::unordered_map<std::string_view, std::unique_ptr<CSkin>> &skins = pThis->m_pClient->m_Skins.GetSkinsUnsafe();
-	
+
 	// map to array
 	int counter = 0;
 	std::vector<std::pair<std::string_view, CSkin *>> skinArray;
diff --git a/src/game/client/components/tater.h b/src/game/client/components/tater.h
index 0dfe0f5ffe3..b228a5cf11c 100644
--- a/src/game/client/components/tater.h
+++ b/src/game/client/components/tater.h
@@ -5,20 +5,18 @@
 
 class CTater : public CComponent
 {
-   
 	static void ConRandomTee(IConsole::IResult *pResult, void *pUserData);
-    static void ConchainRandomColor(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
-    static void RandomBodyColor();
-    static void RandomFeetColor();
-    static void RandomSkin(void *pUserData);
-    static void RandomFlag(void *pUserData);
+	static void ConchainRandomColor(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
+	static void RandomBodyColor();
+	static void RandomFeetColor();
+	static void RandomSkin(void *pUserData);
+	static void RandomFlag(void *pUserData);
+
 public:
 	CTater();
 	virtual int Sizeof() const override { return sizeof(*this); }
 
 	virtual void OnConsoleInit() override;
-
-
 };
 
 #endif
diff --git a/src/game/client/components/verify.cpp b/src/game/client/components/verify.cpp
index 41fe426efec..571c6181278 100644
--- a/src/game/client/components/verify.cpp
+++ b/src/game/client/components/verify.cpp
@@ -1,6 +1,6 @@
+#include <engine/engine.h>
 #include <engine/graphics.h>
 #include <engine/shared/config.h>
-#include <engine/engine.h>
 
 #include <game/client/animstate.h>
 #include <game/client/render.h>