diff --git a/.clang-format b/.clang-format
index 183684af..3e558465 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,5 +1,5 @@
 ---
-AccessModifierOffset: '0'
+AccessModifierOffset: '-4'
 AlignAfterOpenBracket: Align
 AlignConsecutiveAssignments: 'true'
 AlignOperands: 'true'
diff --git a/include/CDumper.hpp b/include/CDumper.hpp
index 2357ea0a..0c43a27c 100644
--- a/include/CDumper.hpp
+++ b/include/CDumper.hpp
@@ -19,7 +19,7 @@
 
 class CDumper
 {
-    public:
+public:
     CDumper()
     {
         m_file.open("/tmp/netdump.txt", std::ios::out | std::ios::trunc);
@@ -115,7 +115,7 @@ class CDumper
             m_file << std::endl;
     }
 
-    private:
+private:
     std::fstream m_file;
 };
 
diff --git a/include/averager.hpp b/include/averager.hpp
index 1fd5f33d..0831b57b 100644
--- a/include/averager.hpp
+++ b/include/averager.hpp
@@ -21,7 +21,7 @@
 
 template <typename T> class Averager
 {
-    public:
+public:
     /*
      * Initialize Averager with a given size
      */
@@ -102,7 +102,7 @@ template <typename T> class Averager
         return value_count_;
     }
 
-    private:
+private:
     std::vector<T> values_;
     size_t size_{ 0 };
     size_t value_count_{ 0 };
diff --git a/include/base64.hpp b/include/base64.hpp
index 58fc2c27..25373c80 100644
--- a/include/base64.hpp
+++ b/include/base64.hpp
@@ -36,7 +36,7 @@ const char kBase64Alphabet[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
 
 class Base64
 {
-    public:
+public:
     static bool Encode(const std::string &in, std::string *out)
     {
         int i = 0, j = 0;
@@ -304,7 +304,7 @@ class Base64
             in->resize(in->size() - 1);
     }
 
-    private:
+private:
     static inline void a3_to_a4(unsigned char *a4, unsigned char *a3)
     {
         a4[0] = (a3[0] & 0xfc) >> 2;
diff --git a/include/classinfo/css.gen.hpp b/include/classinfo/css.gen.hpp
index 6b5cda71..1aeec8f5 100644
--- a/include/classinfo/css.gen.hpp
+++ b/include/classinfo/css.gen.hpp
@@ -11,7 +11,7 @@ namespace client_classes
 
 class css
 {
-    public:
+public:
     int CTETFParticleEffect{ 0 };
     int CTETFExplosion{ 0 };
     int CTETFBlood{ 0 };
diff --git a/include/classinfo/css_constexpr.gen.hpp b/include/classinfo/css_constexpr.gen.hpp
index d872439d..9555808c 100644
--- a/include/classinfo/css_constexpr.gen.hpp
+++ b/include/classinfo/css_constexpr.gen.hpp
@@ -11,7 +11,7 @@ namespace client_classes_constexpr
 
 class css
 {
-    public:
+public:
     static constexpr int CTETFParticleEffect                   = 0;
     static constexpr int CTETFExplosion                        = 0;
     static constexpr int CTETFBlood                            = 0;
diff --git a/include/classinfo/dab.gen.hpp b/include/classinfo/dab.gen.hpp
index 58e0114c..209be827 100644
--- a/include/classinfo/dab.gen.hpp
+++ b/include/classinfo/dab.gen.hpp
@@ -11,7 +11,7 @@ namespace client_classes
 
 class dab
 {
-    public:
+public:
     int CTETFParticleEffect{ 0 };
     int CTETFExplosion{ 0 };
     int CTETFBlood{ 0 };
diff --git a/include/classinfo/dab_constexpr.gen.hpp b/include/classinfo/dab_constexpr.gen.hpp
index aa7ad691..d32604a4 100644
--- a/include/classinfo/dab_constexpr.gen.hpp
+++ b/include/classinfo/dab_constexpr.gen.hpp
@@ -11,7 +11,7 @@ namespace client_classes_constexpr
 
 class dab
 {
-    public:
+public:
     static constexpr int CTETFParticleEffect                   = 0;
     static constexpr int CTETFExplosion                        = 0;
     static constexpr int CTETFBlood                            = 0;
diff --git a/include/classinfo/dummy.gen.hpp b/include/classinfo/dummy.gen.hpp
index 91e87672..a824716a 100644
--- a/include/classinfo/dummy.gen.hpp
+++ b/include/classinfo/dummy.gen.hpp
@@ -11,7 +11,7 @@ namespace client_classes
 
 class dummy
 {
-    public:
+public:
     int CTETFParticleEffect{ 0 };
     int CTETFExplosion{ 0 };
     int CTETFBlood{ 0 };
diff --git a/include/classinfo/dynamic.gen.hpp b/include/classinfo/dynamic.gen.hpp
index 2df48b1e..1c4dcd34 100644
--- a/include/classinfo/dynamic.gen.hpp
+++ b/include/classinfo/dynamic.gen.hpp
@@ -11,7 +11,7 @@ namespace client_classes
 
 class dynamic
 {
-    public:
+public:
     dynamic();
     void Populate();
     int CTETFParticleEffect{ 0 };
diff --git a/include/classinfo/hl2dm.gen.hpp b/include/classinfo/hl2dm.gen.hpp
index 9aa49301..40ecd4bb 100644
--- a/include/classinfo/hl2dm.gen.hpp
+++ b/include/classinfo/hl2dm.gen.hpp
@@ -11,7 +11,7 @@ namespace client_classes
 
 class hl2dm
 {
-    public:
+public:
     int CTETFParticleEffect{ 0 };
     int CTETFExplosion{ 0 };
     int CTETFBlood{ 0 };
diff --git a/include/classinfo/hl2dm_constexpr.gen.hpp b/include/classinfo/hl2dm_constexpr.gen.hpp
index ad2ebde6..57f928fb 100644
--- a/include/classinfo/hl2dm_constexpr.gen.hpp
+++ b/include/classinfo/hl2dm_constexpr.gen.hpp
@@ -11,7 +11,7 @@ namespace client_classes_constexpr
 
 class hl2dm
 {
-    public:
+public:
     static constexpr int CTETFParticleEffect                   = 0;
     static constexpr int CTETFExplosion                        = 0;
     static constexpr int CTETFBlood                            = 0;
diff --git a/include/classinfo/tf2.gen.hpp b/include/classinfo/tf2.gen.hpp
index 09be7085..f66ba19c 100644
--- a/include/classinfo/tf2.gen.hpp
+++ b/include/classinfo/tf2.gen.hpp
@@ -11,7 +11,7 @@ namespace client_classes
 
 class tf2
 {
-    public:
+public:
     int CTETFParticleEffect{ 178 };
     int CTETFExplosion{ 177 };
     int CTETFBlood{ 176 };
diff --git a/include/classinfo/tf2_constexpr.gen.hpp b/include/classinfo/tf2_constexpr.gen.hpp
index 076f59e7..9c43bd8c 100644
--- a/include/classinfo/tf2_constexpr.gen.hpp
+++ b/include/classinfo/tf2_constexpr.gen.hpp
@@ -11,7 +11,7 @@ namespace client_classes_constexpr
 
 class tf2
 {
-    public:
+public:
     static constexpr int CTETFParticleEffect                   = 178;
     static constexpr int CTETFExplosion                        = 177;
     static constexpr int CTETFBlood                            = 176;
diff --git a/include/classinfo/tf2c.gen.hpp b/include/classinfo/tf2c.gen.hpp
index 970a926b..a7d4d780 100644
--- a/include/classinfo/tf2c.gen.hpp
+++ b/include/classinfo/tf2c.gen.hpp
@@ -11,7 +11,7 @@ namespace client_classes
 
 class tf2c
 {
-    public:
+public:
     int CTETFParticleEffect{ 155 };
     int CTETFExplosion{ 154 };
     int CTETFBlood{ 153 };
diff --git a/include/classinfo/tf2c_constexpr.gen.hpp b/include/classinfo/tf2c_constexpr.gen.hpp
index d5a22127..d08ef697 100644
--- a/include/classinfo/tf2c_constexpr.gen.hpp
+++ b/include/classinfo/tf2c_constexpr.gen.hpp
@@ -11,7 +11,7 @@ namespace client_classes_constexpr
 
 class tf2c
 {
-    public:
+public:
     static constexpr int CTETFParticleEffect                   = 155;
     static constexpr int CTETFExplosion                        = 154;
     static constexpr int CTETFBlood                            = 153;
diff --git a/include/copypasted/CSignature.h b/include/copypasted/CSignature.h
index f24beda8..ef798dc8 100644
--- a/include/copypasted/CSignature.h
+++ b/include/copypasted/CSignature.h
@@ -7,7 +7,7 @@
 
 class CSignature
 {
-    public:
+public:
     uintptr_t dwFindPattern(uintptr_t dwAddress, uintptr_t dwLength,
                             const char *szPattern);
     void *GetModuleHandleSafe(const char *pszModuleName);
diff --git a/include/copypasted/Netvar.h b/include/copypasted/Netvar.h
index 6d496a88..60336c9e 100644
--- a/include/copypasted/Netvar.h
+++ b/include/copypasted/Netvar.h
@@ -13,7 +13,7 @@ class RecvProp;
 
 class equal_char
 {
-    public:
+public:
     bool operator()(const char *const &v1, const char *const &v2) const
     {
         return !strcmp(v1, v2);
@@ -22,7 +22,7 @@ class equal_char
 
 struct hash_char
 {
-    public:
+public:
     size_t operator()(const char *obj) const
     {
         size_t res         = 0;
@@ -54,12 +54,12 @@ class netvar_tree
 
     map_type nodes;
 
-    public:
+public:
     // netvar_tree ( );
 
     void init();
 
-    private:
+private:
     void populate_nodes(class RecvTable *recv_table, map_type *map);
 
     /**
@@ -117,7 +117,7 @@ class netvar_tree
         return get_prop_recursive(node->nodes, args...);
     }
 
-    public:
+public:
     /**
      * get_offset - Get the offset of a netvar given a list of branch names
      * @name:	Top level datatable name
diff --git a/include/cvwrapper.hpp b/include/cvwrapper.hpp
index 95f26cb6..ea2e7cd5 100644
--- a/include/cvwrapper.hpp
+++ b/include/cvwrapper.hpp
@@ -34,11 +34,11 @@ enum CatVar_t
 // Enum Something
 class CatEnum
 {
-    public:
+public:
     CatEnum(std::vector<std::string> values, int min = 0);
     std::string Name(int value);
 
-    public:
+public:
     const std::vector<std::string> value_names;
     int min_value;
     int max_value;
@@ -48,7 +48,7 @@ class CatEnum
 // TODO reverse, no idea how catcommands are handled
 class CatCommand
 {
-    public:
+public:
     CatCommand(std::string name, std::string help,
                FnCommandCallback_t callback);
     CatCommand(std::string name, std::string help,
@@ -56,7 +56,7 @@ class CatCommand
 
     void Register();
 
-    public:
+public:
     const std::string name;
     const std::string help{ "" };
 
@@ -68,7 +68,7 @@ class CatCommand
 
 class CatVar
 {
-    public: // TODo, unknown reverse
+public: // TODo, unknown reverse
     CatVar(CatVar_t type, std::string name, std::string defaults,
            std::string desc_short, std::string desc_long = "no description");
     CatVar(CatVar_t type, std::string name, std::string defaults,
@@ -154,7 +154,7 @@ class CatVar
     }
 
     // Storage for the catvar
-    public:
+public:
     const CatVar_t type;
     const std::string name;
     const std::string defaults{ "0" };
diff --git a/include/entitycache.hpp b/include/entitycache.hpp
index bd2a6b47..e50b54e7 100644
--- a/include/entitycache.hpp
+++ b/include/entitycache.hpp
@@ -59,7 +59,7 @@ struct mstudiobbox_t;
 
 class CachedEntity
 {
-    public:
+public:
     CachedEntity();
     ~CachedEntity();
 
diff --git a/include/entityhitboxcache.hpp b/include/entityhitboxcache.hpp
index 262ce9ff..e54d3b09 100644
--- a/include/entityhitboxcache.hpp
+++ b/include/entityhitboxcache.hpp
@@ -29,7 +29,7 @@ struct CachedHitbox
 
 class EntityHitboxCache
 {
-    public:
+public:
     EntityHitboxCache();
     ~EntityHitboxCache();
 
diff --git a/include/globals.h b/include/globals.h
index 2564b71e..44aaa6bc 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -43,7 +43,7 @@ extern time_t time_injected;
 
 class GlobalSettings
 {
-    public:
+public:
     void Init();
     bool bInvalid{ true };
     bool is_create_move{ false };
diff --git a/include/hacks/ESP.hpp b/include/hacks/ESP.hpp
index f924b4f3..1c75127e 100644
--- a/include/hacks/ESP.hpp
+++ b/include/hacks/ESP.hpp
@@ -20,7 +20,7 @@ namespace esp
 // Strings
 class ESPString
 {
-    public:
+public:
     std::string data{ "" };
     rgba_t color{ colors::empty };
 };
@@ -28,7 +28,7 @@ class ESPString
 // Cached data
 class ESPData
 {
-    public:
+public:
     int string_count{ 0 };
     std::array<ESPString, 16> strings{};
     rgba_t color{ colors::empty };
diff --git a/include/hacks/SkinChanger.hpp b/include/hacks/SkinChanger.hpp
index 31b5ce4b..76151786 100644
--- a/include/hacks/SkinChanger.hpp
+++ b/include/hacks/SkinChanger.hpp
@@ -51,10 +51,10 @@ struct attribute_s
 
 class CAttribute
 {
-    public:
+public:
     CAttribute(uint16_t iAttributeDefinitionIndex, float flValue);
 
-    public:
+public:
     void *vtable;
     uint16_t defidx;
     float value;
@@ -63,13 +63,13 @@ class CAttribute
 
 class CAttributeList
 {
-    public:
+public:
     CAttributeList();
     float GetAttribute(int defindex);
     void SetAttribute(int index, float value);
     void RemoveAttribute(int index);
 
-    public:
+public:
     uint32_t unknown;
     CUtlVector<CAttribute, CUtlMemory<CAttribute>> m_Attributes;
 };
@@ -109,7 +109,7 @@ struct patched_weapon_cookie
     void Update(int entity);
     bool Check();
 
-    public:
+public:
     int eidx{ 0 };
     int defidx{ 0 };
     int eclass{ 0 };
diff --git a/include/hooks.hpp b/include/hooks.hpp
index 5decae71..1d8dc5b0 100644
--- a/include/hooks.hpp
+++ b/include/hooks.hpp
@@ -33,7 +33,7 @@ constexpr uint32_t GUARD = 0xD34DC477;
 
 class VMTHook
 {
-    public:
+public:
     VMTHook();
     ~VMTHook();
     void Set(ptr_t inst, uint32_t offset = 0);
@@ -42,7 +42,7 @@ class VMTHook
     void *GetMethod(uint32_t idx) const;
     void Apply();
 
-    public:
+public:
     ptr_t object{ nullptr };
     table_ptr_t vtable_ptr{ nullptr };
     method_table_t vtable_original{ nullptr };
diff --git a/include/https_request.hpp b/include/https_request.hpp
index f3453bd4..b76c3e3a 100644
--- a/include/https_request.hpp
+++ b/include/https_request.hpp
@@ -21,7 +21,7 @@ extern SSL_CTX *ssl_context;
 
 class RAII_HTTPS_Socket
 {
-    public:
+public:
     RAII_HTTPS_Socket(const std::string &host);
     ~RAII_HTTPS_Socket();
 
diff --git a/include/init.hpp b/include/init.hpp
index dcf02e49..a1267d38 100644
--- a/include/init.hpp
+++ b/include/init.hpp
@@ -15,6 +15,6 @@ std::stack<void (*)()> &init_stack();
 
 class InitRoutine
 {
-    public:
+public:
     InitRoutine(void (*func)());
 };
diff --git a/include/itemtypes.hpp b/include/itemtypes.hpp
index 9b8fc32a..af883ceb 100644
--- a/include/itemtypes.hpp
+++ b/include/itemtypes.hpp
@@ -209,7 +209,7 @@ typedef k_EItemType (*ItemSpecialMapperFn)(CachedEntity *);
 
 class ItemModelMapper
 {
-    public:
+public:
     void RegisterItem(std::string modelpath, k_EItemType type);
     k_EItemType GetItemType(CachedEntity *entity);
 
@@ -219,7 +219,7 @@ class ItemModelMapper
 
 class ItemManager
 {
-    public:
+public:
     ItemManager();
     void RegisterModelMapping(std::string path, k_EItemType type);
     void RegisterSpecialMapping(ItemCheckerFn fn, k_EItemType type);
diff --git a/include/json.hpp b/include/json.hpp
index 43d3d223..55acd9ad 100644
--- a/include/json.hpp
+++ b/include/json.hpp
@@ -396,12 +396,12 @@ contains a `mapped_type`, whereas `std::vector` fails the test.
 #define NLOHMANN_JSON_HAS_HELPER(type)                                         \
     template <typename T> struct has_##type                                    \
     {                                                                          \
-        private:                                                               \
+    private:                                                                   \
         template <typename U, typename = typename U::type>                     \
         static int detect(U &&);                                               \
         static void detect(...);                                               \
                                                                                \
-        public:                                                                \
+    public:                                                                    \
         static constexpr bool value =                                          \
             std::is_integral<decltype(detect(std::declval<T>()))>::value;      \
     }
@@ -497,7 +497,7 @@ struct is_compatible_integer_type
 // trait checking if JSONSerializer<T>::from_json(json const&, udt&) exists
 template <typename BasicJsonType, typename T> struct has_from_json
 {
-    private:
+private:
     // also check the return type of from_json
     template <typename U, typename = enable_if_t<std::is_same<
                               void, decltype(uncvref_t<U>::from_json(
@@ -506,7 +506,7 @@ template <typename BasicJsonType, typename T> struct has_from_json
     static int detect(U &&);
     static void detect(...);
 
-    public:
+public:
     static constexpr bool value = std::is_integral<decltype(
         detect(std::declval<typename BasicJsonType::template json_serializer<
                    T, void>>()))>::value;
@@ -516,14 +516,14 @@ template <typename BasicJsonType, typename T> struct has_from_json
 // this overload is used for non-default-constructible user-defined-types
 template <typename BasicJsonType, typename T> struct has_non_default_from_json
 {
-    private:
+private:
     template <typename U, typename = enable_if_t<std::is_same<
                               T, decltype(uncvref_t<U>::from_json(
                                      std::declval<BasicJsonType>()))>::value>>
     static int detect(U &&);
     static void detect(...);
 
-    public:
+public:
     static constexpr bool value = std::is_integral<decltype(
         detect(std::declval<typename BasicJsonType::template json_serializer<
                    T, void>>()))>::value;
@@ -532,14 +532,14 @@ template <typename BasicJsonType, typename T> struct has_non_default_from_json
 // This trait checks if BasicJsonType::json_serializer<T>::to_json exists
 template <typename BasicJsonType, typename T> struct has_to_json
 {
-    private:
+private:
     template <typename U,
               typename = decltype(uncvref_t<U>::to_json(
                   std::declval<BasicJsonType &>(), std::declval<T>()))>
     static int detect(U &&);
     static void detect(...);
 
-    public:
+public:
     static constexpr bool value = std::is_integral<decltype(
         detect(std::declval<typename BasicJsonType::template json_serializer<
                    T, void>>()))>::value;
@@ -898,7 +898,7 @@ void from_json(const BasicJsonType &j, ArithmeticType &val)
 
 struct to_json_fn
 {
-    private:
+private:
     template <typename BasicJsonType, typename T>
     auto call(BasicJsonType &j, T &&val, priority_tag<1>) const
         noexcept(noexcept(to_json(j, std::forward<T>(val))))
@@ -914,7 +914,7 @@ struct to_json_fn
                       "could not find to_json() method in T's namespace");
     }
 
-    public:
+public:
     template <typename BasicJsonType, typename T>
     void operator()(BasicJsonType &j, T &&val) const
         noexcept(noexcept(std::declval<to_json_fn>().call(j,
@@ -927,7 +927,7 @@ struct to_json_fn
 
 struct from_json_fn
 {
-    private:
+private:
     template <typename BasicJsonType, typename T>
     auto call(const BasicJsonType &j, T &val, priority_tag<1>) const
         noexcept(noexcept(from_json(j, val)))
@@ -943,7 +943,7 @@ struct from_json_fn
                       "could not find from_json() method in T's namespace");
     }
 
-    public:
+public:
     template <typename BasicJsonType, typename T>
     void operator()(const BasicJsonType &j, T &val) const
         noexcept(noexcept(std::declval<from_json_fn>().call(j, val,
@@ -1113,7 +1113,7 @@ template <template <typename U, typename V, typename... Args> class ObjectType =
               adl_serializer>
 class basic_json
 {
-    private:
+private:
     template <detail::value_t> friend struct detail::external_constructor;
     /// workaround type for MSVC
     using basic_json_t =
@@ -1121,7 +1121,7 @@ class basic_json
                    NumberIntegerType, NumberUnsignedType, NumberFloatType,
                    AllocatorType, JSONSerializer>;
 
-    public:
+public:
     using value_t = detail::value_t;
     // forward declarations
     template <typename U> class iter_impl;
@@ -1705,7 +1705,7 @@ class basic_json
 
     /// @}
 
-    private:
+private:
     /// helper for exception-safe object creation
     template <typename T, typename... Args> static T *create(Args &&... args)
     {
@@ -1880,7 +1880,7 @@ class basic_json
         assert(m_type != value_t::string or m_value.string != nullptr);
     }
 
-    public:
+public:
     //////////////////////////
     // JSON parser callback //
     //////////////////////////
@@ -2714,7 +2714,7 @@ class basic_json
 
     /// @}
 
-    public:
+public:
     ///////////////////////
     // object inspection //
     ///////////////////////
@@ -3120,7 +3120,7 @@ class basic_json
 
     /// @}
 
-    private:
+private:
     //////////////////
     // value access //
     //////////////////
@@ -3258,7 +3258,7 @@ class basic_json
             obj.type_name()));
     }
 
-    public:
+public:
     /// @name value access
     /// Direct access to the stored value of a JSON value.
     /// @{
@@ -5083,11 +5083,11 @@ class basic_json
         return const_reverse_iterator(cbegin());
     }
 
-    private:
+private:
     // forward declaration
     template <typename IteratorType> class iteration_proxy;
 
-    public:
+public:
     /*!
     @brief wrapper to access iterator member functions in range-based for
 
@@ -6031,7 +6031,7 @@ class basic_json
 
     /// @}
 
-    public:
+public:
     //////////////////////////////////////////
     // lexicographical comparison operators //
     //////////////////////////////////////////
@@ -6757,7 +6757,7 @@ class basic_json
     /// @name binary serialization/deserialization support
     /// @{
 
-    private:
+private:
     /*!
     @note Some code in the switch cases has been copied, because otherwise
           copilers would complain about implicit fallthrough and there is no
@@ -8220,7 +8220,7 @@ class basic_json
         }
     }
 
-    public:
+public:
     /*!
     @brief create a MessagePack serialization of a given JSON value
 
@@ -8390,7 +8390,7 @@ class basic_json
         }
     }
 
-    private:
+private:
     /*!
     @brief calculates the extra space to escape a JSON string
 
@@ -8555,7 +8555,7 @@ class basic_json
     */
     struct numtostr
     {
-        public:
+    public:
         template <typename NumberType> numtostr(NumberType value)
         {
             x_write(value, std::is_integral<NumberType>());
@@ -8566,7 +8566,7 @@ class basic_json
             return m_buf.data();
         }
 
-        private:
+    private:
         /// a (hopefully) large enough character buffer
         std::array<char, 64> m_buf{ {} };
 
@@ -8848,7 +8848,7 @@ class basic_json
         }
     }
 
-    private:
+private:
     //////////////////////
     // member variables //
     //////////////////////
@@ -8859,7 +8859,7 @@ class basic_json
     /// the value of the current element
     json_value m_value = {};
 
-    private:
+private:
     ///////////////
     // iterators //
     ///////////////
@@ -8875,7 +8875,7 @@ class basic_json
     */
     class primitive_iterator_t
     {
-        public:
+    public:
         difference_type get_value() const noexcept
         {
             return m_it;
@@ -8997,7 +8997,7 @@ class basic_json
             return *this;
         }
 
-        private:
+    private:
         static constexpr difference_type begin_value = 0;
         static constexpr difference_type end_value   = begin_value + 1;
 
@@ -9032,17 +9032,17 @@ class basic_json
     /// proxy class for the iterator_wrapper functions
     template <typename IteratorType> class iteration_proxy
     {
-        private:
+    private:
         /// helper class for iteration
         class iteration_proxy_internal
         {
-            private:
+        private:
             /// the iterator
             IteratorType anchor;
             /// an index for arrays (used to create key names)
             size_t array_index = 0;
 
-            public:
+        public:
             explicit iteration_proxy_internal(IteratorType it) noexcept
                 : anchor(it)
             {
@@ -9106,7 +9106,7 @@ class basic_json
         /// the container to iterate
         typename IteratorType::reference container;
 
-        public:
+    public:
         /// construct iteration proxy from a container
         explicit iteration_proxy(typename IteratorType::reference cont)
             : container(cont)
@@ -9126,7 +9126,7 @@ class basic_json
         }
     };
 
-    public:
+public:
     /*!
     @brief a template for a random access iterator for the @ref basic_json class
 
@@ -9158,7 +9158,7 @@ class basic_json
                           std::is_same<U, const basic_json>::value,
                       "iter_impl only accepts (const) basic_json");
 
-        public:
+    public:
         /// the type of the values when the iterator is dereferenced
         using value_type = typename basic_json::value_type;
         /// a type to represent differences between iterators
@@ -9259,7 +9259,7 @@ class basic_json
             return *this;
         }
 
-        private:
+    private:
         /*!
         @brief set the iterator to the first value
         @pre The iterator is initialized; i.e. `m_object != nullptr`.
@@ -9327,7 +9327,7 @@ class basic_json
             }
         }
 
-        public:
+    public:
         /*!
         @brief return a reference to the value pointed to by the iterator
         @pre The iterator is initialized; i.e. `m_object != nullptr`.
@@ -9749,7 +9749,7 @@ class basic_json
             return operator*();
         }
 
-        private:
+    private:
         /// associated JSON instance
         pointer m_object = nullptr;
         /// the actual iterator of the associated instance
@@ -9777,7 +9777,7 @@ class basic_json
     template <typename Base>
     class json_reverse_iterator : public std::reverse_iterator<Base>
     {
-        public:
+    public:
         /// shortcut to the reverse iterator adaptor
         using base_iterator = std::reverse_iterator<Base>;
         /// the reference type for the pointed-to element
@@ -9872,7 +9872,7 @@ class basic_json
         }
     };
 
-    private:
+private:
     //////////////////////
     // lexer and parser //
     //////////////////////
@@ -9886,7 +9886,7 @@ class basic_json
     */
     class lexer
     {
-        public:
+    public:
         /// token types for the parser
         enum class token_type
         {
@@ -11451,7 +11451,7 @@ class basic_json
         */
         struct strtonum
         {
-            public:
+        public:
             strtonum(const char *start, const char *end)
                 : m_start(start), m_end(end)
             {
@@ -11470,7 +11470,7 @@ class basic_json
                 return parse(val, std::is_integral<T>());
             }
 
-            private:
+        private:
             const char *const m_start = nullptr;
             const char *const m_end   = nullptr;
 
@@ -11686,7 +11686,7 @@ class basic_json
             return false;
         }
 
-        private:
+    private:
         /// optional input stream
         std::istream *m_stream = nullptr;
         /// line buffer buffer for m_stream
@@ -11714,7 +11714,7 @@ class basic_json
     */
     class parser
     {
-        public:
+    public:
         /// a parser reading from a string literal
         parser(const char *buff, const parser_callback_t cb = nullptr)
             : callback(cb),
@@ -11762,7 +11762,7 @@ class basic_json
             return result.is_discarded() ? basic_json() : std::move(result);
         }
 
-        private:
+    private:
         /// the actual parser
         basic_json parse_internal(bool keep)
         {
@@ -11999,7 +11999,7 @@ class basic_json
             }
         }
 
-        private:
+    private:
         /// current level of recursion
         int depth = 0;
         /// callback function
@@ -12011,7 +12011,7 @@ class basic_json
         lexer m_lexer;
     };
 
-    public:
+public:
     /*!
     @brief JSON Pointer
 
@@ -12028,7 +12028,7 @@ class basic_json
         /// allow basic_json to access private members
         friend class basic_json;
 
-        public:
+    public:
         /*!
         @brief create JSON pointer
 
@@ -12086,7 +12086,7 @@ class basic_json
             return to_string();
         }
 
-        private:
+    private:
         /// remove and return last reference pointer
         std::string pop_back()
         {
@@ -12492,7 +12492,7 @@ class basic_json
             return result;
         }
 
-        private:
+    private:
         /*!
         @brief replace all occurrences of a substring by another string
 
@@ -12631,7 +12631,7 @@ class basic_json
             return result;
         }
 
-        private:
+    private:
         friend bool operator==(json_pointer const &lhs,
                                json_pointer const &rhs) noexcept
         {
diff --git a/include/localplayer.hpp b/include/localplayer.hpp
index 69749408..f1cbdc4a 100644
--- a/include/localplayer.hpp
+++ b/include/localplayer.hpp
@@ -15,7 +15,7 @@ class CachedEntity;
 
 class LocalPlayer
 {
-    public:
+public:
     void Update();
     int team;
     int health;
diff --git a/include/netmessage.hpp b/include/netmessage.hpp
index b60569e1..2b9cda85 100644
--- a/include/netmessage.hpp
+++ b/include/netmessage.hpp
@@ -16,7 +16,7 @@
 #include <inetmsghandler.h>
 
 #define DECLARE_BASE_MESSAGE(msgtype)                                          \
-    public:                                                                    \
+public:                                                                        \
     bool ReadFromBuffer(bf_read &buffer);                                      \
     bool WriteToBuffer(bf_write &buffer);                                      \
     const char *ToString() const;                                              \
@@ -63,7 +63,7 @@
 
 class CNetMessage : public INetMessage
 {
-    public:
+public:
     CNetMessage()
     {
         m_bReliable  = true;
@@ -98,7 +98,7 @@ class CNetMessage : public INetMessage
         return false;
     }; // no handler set
 
-    protected:
+protected:
     bool m_bReliable;          // true if message should be send reliable
     INetChannel *m_NetChannel; // netchannel this message is from/for
 };
@@ -195,7 +195,7 @@ typedef enum {
 
 class CLC_RespondCvarValue : public CNetMessage
 {
-    public:
+public:
     DECLARE_CLC_MESSAGE(RespondCvarValue);
 
     QueryCvarCookie_t m_iCookie;
@@ -207,7 +207,7 @@ class CLC_RespondCvarValue : public CNetMessage
 
     EQueryCvarValueStatus m_eStatusCode;
 
-    private:
+private:
     char m_szCvarNameBuffer[256];
     char m_szCvarValueBuffer[256];
 };
@@ -239,21 +239,21 @@ class NET_SignonState : public CNetMessage
         m_nSpawnCount  = spawncount;
     };
 
-    public:
+public:
     int m_nSignonState; // See SIGNONSTATE_ defines
     int m_nSpawnCount;  // server spawn count (session number)
 };
 
 class SVC_GetCvarValue : public CNetMessage
 {
-    public:
+public:
     DECLARE_SVC_MESSAGE(GetCvarValue);
 
     QueryCvarCookie_t m_iCookie;
     const char *m_szCvarName; // The sender sets this, and it automatically
                               // points it at m_szCvarNameBuffer when receiving.
 
-    private:
+private:
     char m_szCvarNameBuffer[256];
 };
 
@@ -277,7 +277,7 @@ class NET_SetConVar : public CNetMessage
         convar = cvar;
     }
 
-    public:
+public:
     typedef struct cvar_s
     {
         char name[MAX_OSPATH];
@@ -305,10 +305,10 @@ class NET_StringCmd : public CNetMessage
         m_szCommand = cmd;
     };
 
-    public:
+public:
     const char *m_szCommand; // execute this command
 
-    private:
+private:
     char m_szCommandBuffer[1024]; // buffer for received messages
 };
 
diff --git a/include/netvars.hpp b/include/netvars.hpp
index 54029696..534a729a 100644
--- a/include/netvars.hpp
+++ b/include/netvars.hpp
@@ -43,7 +43,7 @@ void InitNetVars();
 
 class NetVars
 {
-    public:
+public:
     void Init();
     offset_t iTeamNum;
     offset_t iFlags;
diff --git a/include/playerresource.h b/include/playerresource.h
index 5928c0e4..10efe582 100644
--- a/include/playerresource.h
+++ b/include/playerresource.h
@@ -12,7 +12,7 @@ class CachedEntity;
 
 class TFPlayerResource
 {
-    public:
+public:
     void Update();
     int GetMaxHealth(CachedEntity *player);
     int GetMaxBuffedHealth(CachedEntity *player);
diff --git a/include/profiler.hpp b/include/profiler.hpp
index 273897a4..211d7ccb 100644
--- a/include/profiler.hpp
+++ b/include/profiler.hpp
@@ -17,7 +17,7 @@ class ProfilerNode;
 
 class ProfilerSection
 {
-    public:
+public:
     ProfilerSection(std::string name, ProfilerSection *parent = nullptr);
 
     void OnNodeDeath(ProfilerNode &node);
@@ -34,7 +34,7 @@ class ProfilerSection
 
 class ProfilerNode
 {
-    public:
+public:
     ProfilerNode(ProfilerSection &section);
     ~ProfilerNode();
 
diff --git a/include/reclasses/CTFPlayerShared.hpp b/include/reclasses/CTFPlayerShared.hpp
index 9a3a1597..7f14e35d 100644
--- a/include/reclasses/CTFPlayerShared.hpp
+++ b/include/reclasses/CTFPlayerShared.hpp
@@ -1,6 +1,6 @@
 class CTFPlayerShared
 {
-    public:
+public:
     inline static float GetCritMult(CTFPlayerShared *self)
     {
         return ((fminf(fmaxf(*(float *) (unsigned(self) + 672) * 0.0039215689f,
diff --git a/include/reclasses/C_BaseCombatWeapon.hpp b/include/reclasses/C_BaseCombatWeapon.hpp
index d2b28fce..0e0040a9 100644
--- a/include/reclasses/C_BaseCombatWeapon.hpp
+++ b/include/reclasses/C_BaseCombatWeapon.hpp
@@ -9,7 +9,7 @@
 
 class C_BaseCombatWeapon : public C_BaseEntity
 {
-    public:
+public:
     inline static bool IsBaseCombatWeapon(IClientEntity *self)
     {
         typedef bool (*fn_t)(IClientEntity *);
diff --git a/include/reclasses/C_BaseEntity.hpp b/include/reclasses/C_BaseEntity.hpp
index ce5a9ea3..c53a8e0c 100644
--- a/include/reclasses/C_BaseEntity.hpp
+++ b/include/reclasses/C_BaseEntity.hpp
@@ -9,7 +9,7 @@
 
 class C_BaseEntity
 {
-    public:
+public:
     inline static bool IsPlayer(IClientEntity *self)
     {
         typedef bool (*fn_t)(IClientEntity *);
diff --git a/include/reclasses/C_BasePlayer.hpp b/include/reclasses/C_BasePlayer.hpp
index 6be1b217..2dc39a44 100644
--- a/include/reclasses/C_BasePlayer.hpp
+++ b/include/reclasses/C_BasePlayer.hpp
@@ -1,6 +1,6 @@
 class C_BasePlayer : public C_BaseEntity
 {
-    public:
+public:
     inline static CTFPlayerShared &shared_(IClientEntity *self)
     {
         return *((CTFPlayerShared *) (unsigned(self) + 6092));
diff --git a/include/reclasses/C_TFWeaponBase.hpp b/include/reclasses/C_TFWeaponBase.hpp
index 03eb7a15..941e2b1c 100644
--- a/include/reclasses/C_TFWeaponBase.hpp
+++ b/include/reclasses/C_TFWeaponBase.hpp
@@ -9,7 +9,7 @@
 
 class C_TFWeaponBase : public re::C_BaseCombatWeapon
 {
-    public:
+public:
     inline static IClientEntity *GetOwnerViaInterface(IClientEntity *self)
     {
         typedef IClientEntity *(*fn_t)(IClientEntity *);
diff --git a/include/reclasses/C_TFWeaponBaseGun.hpp b/include/reclasses/C_TFWeaponBaseGun.hpp
index 7ce013c1..19a9f9ec 100644
--- a/include/reclasses/C_TFWeaponBaseGun.hpp
+++ b/include/reclasses/C_TFWeaponBaseGun.hpp
@@ -9,7 +9,7 @@
 
 class C_TFWeaponBaseGun : public C_TFWeaponBase
 {
-    public:
+public:
     inline static float GetProjectileSpeed(IClientEntity *self)
     {
         typedef float (*fn_t)(IClientEntity *);
diff --git a/include/reclasses/C_TFWeaponBaseMelee.hpp b/include/reclasses/C_TFWeaponBaseMelee.hpp
index a4cdd0af..e541e054 100644
--- a/include/reclasses/C_TFWeaponBaseMelee.hpp
+++ b/include/reclasses/C_TFWeaponBaseMelee.hpp
@@ -9,7 +9,7 @@
 
 class C_TFWeaponBaseMelee : public C_TFWeaponBase
 {
-    public:
+public:
     inline static bool DoSwingTrace(IClientEntity *self, trace_t *trace)
     {
         typedef bool (*fn_t)(IClientEntity *, trace_t *);
diff --git a/include/sconvars.hpp b/include/sconvars.hpp
index e97f4357..78233a7d 100644
--- a/include/sconvars.hpp
+++ b/include/sconvars.hpp
@@ -20,10 +20,10 @@ namespace sconvar
 
 class SpoofedConVar
 {
-    public:
+public:
     SpoofedConVar(ConVar *var);
 
-    public:
+public:
     ConVar *original;
     ConVar *spoof;
 };
diff --git a/include/sdk/CGameRules.h b/include/sdk/CGameRules.h
index 827144f0..770781ff 100644
--- a/include/sdk/CGameRules.h
+++ b/include/sdk/CGameRules.h
@@ -9,7 +9,7 @@
 
 class CGameRules
 {
-    public:
+public:
     int unknown_pad_0[12];
     int roundmode;
     int unknown_pad_1[1];
diff --git a/include/sdk/HUD.h b/include/sdk/HUD.h
index 722cd61c..563f54fd 100644
--- a/include/sdk/HUD.h
+++ b/include/sdk/HUD.h
@@ -13,7 +13,7 @@
 
 class CHudBaseChat
 {
-    public:
+public:
     void *vtable;
     inline void Printf(const char *string)
     {
@@ -25,13 +25,13 @@ class CHudBaseChat
 
 class CHudElement
 {
-    public:
+public:
     void *vtable;
 };
 
 class CHud
 {
-    public:
+public:
     void *vtable;
 
     CHudElement *FindElement(const char *name);
diff --git a/include/sdk/ScreenSpaceEffects.h b/include/sdk/ScreenSpaceEffects.h
index 913e1cc3..d9318a75 100644
--- a/include/sdk/ScreenSpaceEffects.h
+++ b/include/sdk/ScreenSpaceEffects.h
@@ -20,7 +20,7 @@ class KeyValues;
 //------------------------------------------------------------------------------
 class IScreenSpaceEffect
 {
-    public:
+public:
     virtual void Init()     = 0;
     virtual void Shutdown() = 0;
 
@@ -37,7 +37,7 @@ class IScreenSpaceEffect
 //------------------------------------------------------------------------------
 class IScreenSpaceEffectManager
 {
-    public:
+public:
     virtual void InitScreenSpaceEffects()     = 0;
     virtual void ShutdownScreenSpaceEffects() = 0;
 
@@ -68,7 +68,7 @@ extern IScreenSpaceEffectManager *g_pScreenSpaceEffects;
 //-------------------------------------------------------------------------------------
 class CScreenSpaceEffectRegistration
 {
-    public:
+public:
     CScreenSpaceEffectRegistration(const char *pName,
                                    IScreenSpaceEffect *pEffect);
 
diff --git a/include/sdk/TFGCClientSystem.hpp b/include/sdk/TFGCClientSystem.hpp
index 7fe89e09..947a1803 100644
--- a/include/sdk/TFGCClientSystem.hpp
+++ b/include/sdk/TFGCClientSystem.hpp
@@ -9,7 +9,7 @@
 
 class TFGCClientSystem
 {
-    public:
+public:
     int RequestSelectWizardStep(int type);
     int GetState();
     /* 55 89 E5 57 56 8D 75 C8 53 81 EC 8C 00 00 00 8B 45 0C C7 04 24 ? ? ? ? 8B
diff --git a/include/sdk/igamemovement.h b/include/sdk/igamemovement.h
index 3d1010ec..f21748a2 100644
--- a/include/sdk/igamemovement.h
+++ b/include/sdk/igamemovement.h
@@ -39,7 +39,7 @@ class IMoveHelper;
 
 class CMoveData
 {
-    public:
+public:
     bool m_bFirstRunOfFunctions : 1;
     bool m_bGameCodeMovedPlayer : 1;
 
@@ -79,7 +79,7 @@ class CMoveData
     void SetAbsOrigin(const Vector &vec);
     const Vector &GetAbsOrigin() const;
 
-    private:
+private:
     Vector m_vecAbsOrigin; // edict::origin
 };
 
@@ -114,7 +114,7 @@ inline void CMoveData::SetAbsOrigin(const Vector &vec)
 
 abstract_class IGameMovement
 {
-    public:
+public:
     virtual ~IGameMovement(void)
     {
     }
diff --git a/include/sdk/iinput.h b/include/sdk/iinput.h
index b3857f0a..65810588 100644
--- a/include/sdk/iinput.h
+++ b/include/sdk/iinput.h
@@ -29,7 +29,7 @@ struct CameraThirdData_t
 
 class IInput
 {
-    public:
+public:
     // Initialization/shutdown of the subsystem
     virtual void Init_All(void)     = 0;
     virtual void Shutdown_All(void) = 0;
diff --git a/include/sdk/imaterialsystemfixed.h b/include/sdk/imaterialsystemfixed.h
index d9315ce0..f596fb1a 100644
--- a/include/sdk/imaterialsystemfixed.h
+++ b/include/sdk/imaterialsystemfixed.h
@@ -55,7 +55,7 @@ class IFileList;
 
 abstract_class IMaterialSystemFixed : public IAppSystem
 {
-    public:
+public:
     // Placeholder for API revision
     virtual bool Connect(CreateInterfaceFn factory)          = 0;
     virtual void Disconnect()                                = 0;
diff --git a/include/sharedobj.hpp b/include/sharedobj.hpp
index 56215b68..98916c4c 100644
--- a/include/sharedobj.hpp
+++ b/include/sharedobj.hpp
@@ -23,13 +23,13 @@ bool LocateSharedObject(std::string &name, std::string &out_full_path);
 
 class SharedObject
 {
-    public:
+public:
     SharedObject(const char *_file, bool _factory);
     void Load();
     char *Pointer(uintptr_t offset) const;
     void *CreateInterface(const std::string &interface);
 
-    public:
+public:
     std::string file;
     std::string path;
     bool factory{ false };
diff --git a/include/textfile.hpp b/include/textfile.hpp
index 6efc6437..be446248 100644
--- a/include/textfile.hpp
+++ b/include/textfile.hpp
@@ -15,14 +15,14 @@
 
 class TextFile
 {
-    public:
+public:
     TextFile();
     void Load(std::string filename);
     bool TryLoad(std::string filename);
     size_t LineCount() const;
     const std::string &Line(size_t id) const;
 
-    public:
+public:
     std::vector<std::string> lines;
 };
 
diff --git a/include/timer.hpp b/include/timer.hpp
index c9fcd2a2..86b0f8f9 100644
--- a/include/timer.hpp
+++ b/include/timer.hpp
@@ -11,7 +11,7 @@
 
 class Timer
 {
-    public:
+public:
     typedef std::chrono::system_clock clock;
 
     inline Timer(){};
@@ -36,6 +36,6 @@ class Timer
         last = clock::now();
     }
 
-    public:
+public:
     std::chrono::time_point<clock> last{};
 };
diff --git a/include/trace.hpp b/include/trace.hpp
index 02c74791..193c9b3f 100644
--- a/include/trace.hpp
+++ b/include/trace.hpp
@@ -20,10 +20,10 @@ namespace trace
 
 class FilterDefault : public ITraceFilter
 {
-    public:
+public:
     IClientEntity *m_pSelf;
 
-    public:
+public:
     virtual ~FilterDefault();
     FilterDefault();
     virtual bool ShouldHitEntity(IHandleEntity *entity, int mask);
@@ -33,10 +33,10 @@ class FilterDefault : public ITraceFilter
 
 class FilterNoPlayer : public ITraceFilter
 {
-    public:
+public:
     IClientEntity *m_pSelf;
 
-    public:
+public:
     virtual ~FilterNoPlayer();
     FilterNoPlayer();
     virtual bool ShouldHitEntity(IHandleEntity *entity, int mask);
@@ -46,11 +46,11 @@ class FilterNoPlayer : public ITraceFilter
 
 class FilterPenetration : public ITraceFilter
 {
-    public:
+public:
     IClientEntity *m_pSelf;
     IClientEntity *m_pIgnoreFirst;
 
-    public:
+public:
     virtual ~FilterPenetration();
     FilterPenetration();
     virtual bool ShouldHitEntity(IHandleEntity *entity, int mask);
diff --git a/include/usercmd.hpp b/include/usercmd.hpp
index a40acd9c..86f8cd3a 100644
--- a/include/usercmd.hpp
+++ b/include/usercmd.hpp
@@ -15,7 +15,7 @@
 
 class CUserCmd
 {
-    public:
+public:
     virtual ~CUserCmd(){};
     int command_number;
     int tick_count;
diff --git a/include/visual/EffectChams.hpp b/include/visual/EffectChams.hpp
index 63723bbe..e1dca2fe 100644
--- a/include/visual/EffectChams.hpp
+++ b/include/visual/EffectChams.hpp
@@ -17,7 +17,7 @@ namespace effect_chams
 
 class EffectChams : public IScreenSpaceEffect
 {
-    public:
+public:
     virtual void Init();
     inline virtual void Shutdown(){};
 
@@ -41,7 +41,7 @@ class EffectChams : public IScreenSpaceEffect
     void EndRenderChams();
     void RenderChamsRecursive(IClientEntity *entity);
 
-    public:
+public:
     bool init{ false };
     bool drawing{ false };
     bool enabled;
diff --git a/include/visual/EffectGlow.hpp b/include/visual/EffectGlow.hpp
index a9d95a5b..386fe9a4 100644
--- a/include/visual/EffectGlow.hpp
+++ b/include/visual/EffectGlow.hpp
@@ -16,7 +16,7 @@ namespace effect_glow
 
 class EffectGlow : public IScreenSpaceEffect
 {
-    public:
+public:
     virtual void Init();
     inline virtual void Shutdown(){};
 
@@ -44,7 +44,7 @@ class EffectGlow : public IScreenSpaceEffect
     void BeginRenderGlow();
     void EndRenderGlow();
 
-    public:
+public:
     bool init{ false };
     bool drawing{ false };
     bool enabled;
diff --git a/include/visual/atlas.hpp b/include/visual/atlas.hpp
index b408c5d0..02cdcac9 100644
--- a/include/visual/atlas.hpp
+++ b/include/visual/atlas.hpp
@@ -19,14 +19,14 @@ class sprite;
 
 class sprite
 {
-    public:
+public:
     sprite(float x, float y, float w, float h, const texture_atlas &atlas);
 
-    public:
+public:
     void draw(float scrx, float scry, float scrw, float scrh,
               const rgba_t &rgba) const;
 
-    public:
+public:
     const float nx;
     const float ny;
     const float nw;
@@ -37,13 +37,13 @@ class sprite
 
 class texture_atlas
 {
-    public:
+public:
     texture_atlas(std::string filename, float width, float height);
 
-    public:
+public:
     sprite create_sprite(float x, float y, float sx, float sy) const;
 
-    public:
+public:
     const float width;
     const float height;
 
diff --git a/src/chatlog.cpp b/src/chatlog.cpp
index a7d075d7..72a38208 100644
--- a/src/chatlog.cpp
+++ b/src/chatlog.cpp
@@ -25,7 +25,7 @@ CatVar dont_log_ipc(CV_SWITCH, "chat_log_noipc", "1", "No IPC",
 
 class RAIILog
 {
-    public:
+public:
     RAIILog()
     {
         open();
diff --git a/src/fidgetspinner.cpp b/src/fidgetspinner.cpp
index 666c0ae0..dc09c401 100644
--- a/src/fidgetspinner.cpp
+++ b/src/fidgetspinner.cpp
@@ -23,7 +23,7 @@ float angle          = 0;
 
 class SpinnerListener : public IGameEventListener
 {
-    public:
+public:
     virtual void FireGameEvent(KeyValues *event)
     {
         std::string name(event->GetName());
diff --git a/src/hack.cpp b/src/hack.cpp
index d80103b8..548b057a 100644
--- a/src/hack.cpp
+++ b/src/hack.cpp
@@ -83,7 +83,7 @@ std::stack<std::string> &hack::command_stack()
 
 class AdvancedEventListener : public IGameEventListener
 {
-    public:
+public:
     virtual void FireGameEvent(KeyValues *event)
     {
         if (!event_log)
diff --git a/src/hacks/AntiCheat.cpp b/src/hacks/AntiCheat.cpp
index c7d9d349..e8c03200 100644
--- a/src/hacks/AntiCheat.cpp
+++ b/src/hacks/AntiCheat.cpp
@@ -80,7 +80,7 @@ void ResetEverything()
 
 class ACListener : public IGameEventListener
 {
-    public:
+public:
     virtual void FireGameEvent(KeyValues *event)
     {
         if (!enabled)
diff --git a/src/hacks/AutoTaunt.cpp b/src/hacks/AutoTaunt.cpp
index 5d185b04..31d69247 100644
--- a/src/hacks/AutoTaunt.cpp
+++ b/src/hacks/AutoTaunt.cpp
@@ -23,7 +23,7 @@ CatVar chance(CV_FLOAT, "autotaunt_chance", "8", "AutoTaunt chance",
 
 class AutoTauntListener : public IGameEventListener2
 {
-    public:
+public:
     virtual void FireGameEvent(IGameEvent *event)
     {
         if (!enabled)
diff --git a/src/hacks/HealArrows.cpp b/src/hacks/HealArrows.cpp
index 7e7531a7..621150d1 100644
--- a/src/hacks/HealArrows.cpp
+++ b/src/hacks/HealArrows.cpp
@@ -33,7 +33,7 @@ float healarrow_time = 0.0f;
 
 class HealArrowListener : public IGameEventListener
 {
-    public:
+public:
     virtual void FireGameEvent(KeyValues *event)
     {
         if (!healarrow)
diff --git a/src/hitrate.cpp b/src/hitrate.cpp
index fc499ca3..2a046cd9 100644
--- a/src/hitrate.cpp
+++ b/src/hitrate.cpp
@@ -86,7 +86,7 @@ void Update()
 
 class HurtListener : public IGameEventListener
 {
-    public:
+public:
     virtual void FireGameEvent(KeyValues *event)
     {
         if (strcmp("player_hurt", event->GetName()))
diff --git a/src/netmessage.cpp b/src/netmessage.cpp
index 8b867ffd..24d44ae0 100644
--- a/src/netmessage.cpp
+++ b/src/netmessage.cpp
@@ -38,7 +38,7 @@ inline int BitForBitnum(int bitnum)
 
 class CBitWriteMasksInit
 {
-    public:
+public:
     CBitWriteMasksInit()
     {
         for (unsigned int startbit = 0; startbit < 32; startbit++)
diff --git a/src/sdk/KeyValues.cpp b/src/sdk/KeyValues.cpp
index f5f7a391..079a4bb1 100644
--- a/src/sdk/KeyValues.cpp
+++ b/src/sdk/KeyValues.cpp
@@ -53,7 +53,7 @@ static char s_pTokenBuf[KEYVALUES_TOKEN_SIZE];
 const int MAX_ERROR_STACK = 64;
 class CKeyValuesErrorStack
 {
-    public:
+public:
     CKeyValuesErrorStack()
         : m_pFilename("NULL"), m_errorIndex(0), m_maxErrorIndex(0)
     {
@@ -124,7 +124,7 @@ class CKeyValuesErrorStack
             Warning("\n");
     }
 
-    private:
+private:
     int m_errorStack[MAX_ERROR_STACK];
     const char *m_pFilename;
     int m_errorIndex;
@@ -134,7 +134,7 @@ class CKeyValuesErrorStack
 // a simple helper that creates stack entries as it goes in & out of scope
 class CKeyErrorContext
 {
-    public:
+public:
     CKeyErrorContext(KeyValues *pKv)
     {
         Init(pKv->GetNameSymbol());
@@ -157,7 +157,7 @@ class CKeyErrorContext
         return m_stackLevel;
     }
 
-    private:
+private:
     void Init(int symName)
     {
         m_stackLevel = g_KeyValuesErrorStack.Push(symName);
@@ -173,7 +173,7 @@ class CKeyErrorContext
 
 class CLeakTrack
 {
-    public:
+public:
     CLeakTrack()
     {
     }
@@ -234,7 +234,7 @@ static CLeakTrack track;
 //-----------------------------------------------------------------------------
 class CKeyValuesGrowableStringTable
 {
-    public:
+public:
     // Constructor
     CKeyValuesGrowableStringTable()
         :
@@ -287,12 +287,12 @@ class CKeyValuesGrowableStringTable
         return (const char *) m_vecStrings.Base() + symbol;
     }
 
-    private:
+private:
     // A class plugged into CUtlHash that allows us to change the behavior of
     // the table and store only the index in the table.
     class CLookupFunctor
     {
-        public:
+    public:
         CLookupFunctor() : m_pchCurString(NULL), m_pchCurBase(NULL)
         {
         }
@@ -324,7 +324,7 @@ class CKeyValuesGrowableStringTable
             return HashStringCaseless(m_pchCurString);
         }
 
-        private:
+    private:
         const char *m_pchCurString;
         const char *m_pchCurBase;
     };
@@ -1222,7 +1222,7 @@ void KeyValues::AddSubkeyUsingKnownLastChild(KeyValues *pSubkey,
         Assert(pLastChild->m_pPeer == NULL);
 
         //		// In debug, make sure that they really do know which child is
-        //the  last one 		#ifdef _DEBUG 			KeyValues *pTempDat =
+        // the  last one 		#ifdef _DEBUG 			KeyValues *pTempDat =
         // m_pSub; 			while ( pTempDat->GetNextKey() != NULL )
         //			{
         //				pTempDat = pTempDat->GetNextKey();
diff --git a/src/sdk/convar.cpp b/src/sdk/convar.cpp
index 37f73573..c03ce5ee 100644
--- a/src/sdk/convar.cpp
+++ b/src/sdk/convar.cpp
@@ -54,7 +54,7 @@ void SetCVarInterface(ICvar *iface)
 
 class CDefaultAccessor : public IConCommandBaseAccessor
 {
-    public:
+public:
     virtual bool RegisterConCommandBase(ConCommandBase *pVar)
     {
         // Link to engine's list instead
@@ -1089,7 +1089,7 @@ void ConVar::SetDefault(const char *pszDefault)
 //-----------------------------------------------------------------------------
 class CEmptyConVar : public ConVar
 {
-    public:
+public:
     CEmptyConVar() : ConVar("", "0")
     {
     }
diff --git a/src/sdk/utlbuffer.cpp b/src/sdk/utlbuffer.cpp
index 291381a1..b46151a6 100644
--- a/src/sdk/utlbuffer.cpp
+++ b/src/sdk/utlbuffer.cpp
@@ -25,14 +25,14 @@
 //-----------------------------------------------------------------------------
 class CUtlCStringConversion : public CUtlCharConversion
 {
-    public:
+public:
     CUtlCStringConversion(char nEscapeChar, const char *pDelimiter, int nCount,
                           ConversionArray_t *pArray);
 
     // Finds a conversion for the passed-in string, returns length
     virtual char FindConversion(const char *pString, int *pLength);
 
-    private:
+private:
     char m_pConversion[256];
 };
 
@@ -41,7 +41,7 @@ class CUtlCStringConversion : public CUtlCharConversion
 //-----------------------------------------------------------------------------
 class CUtlNoEscConversion : public CUtlCharConversion
 {
-    public:
+public:
     CUtlNoEscConversion(char nEscapeChar, const char *pDelimiter, int nCount,
                         ConversionArray_t *pArray)
         : CUtlCharConversion(nEscapeChar, pDelimiter, nCount, pArray)