diff --git a/Bigfoot/Sources/Utils/Include/Utils/Assert.hpp b/Bigfoot/Sources/Utils/Include/Utils/Assert.hpp
index 637fc5b..708a39c 100644
--- a/Bigfoot/Sources/Utils/Include/Utils/Assert.hpp
+++ b/Bigfoot/Sources/Utils/Include/Utils/Assert.hpp
@@ -62,7 +62,7 @@
             HANDLER::Handle(location, p_message __VA_OPT__(, ) __VA_ARGS__);                                           \
             if (Bigfoot::Singleton<Bigfoot::Log>::HasInstance())                                                       \
             {                                                                                                          \
-                Bigfoot::Singleton<Bigfoot::Log>::GetInstance().Flush();                                                  \
+                Bigfoot::Singleton<Bigfoot::Log>::GetInstance().Flush();                                               \
             }                                                                                                          \
             BREAK;                                                                                                     \
             std::abort();                                                                                              \
diff --git a/Bigfoot/Sources/Utils/Include/Utils/Containers/SlotMap.hpp b/Bigfoot/Sources/Utils/Include/Utils/Containers/SlotMap.hpp
index 4d50499..3361112 100644
--- a/Bigfoot/Sources/Utils/Include/Utils/Containers/SlotMap.hpp
+++ b/Bigfoot/Sources/Utils/Include/Utils/Containers/SlotMap.hpp
@@ -145,8 +145,8 @@ class SlotMap
     [[nodiscard]]
     bool Has(const SlotKey p_slotKey) const
     {
-        return p_slotKey.Valid() &&
-               (p_slotKey.GetIndex() < m_slots.size() && p_slotKey.GetVersion() == m_slots[p_slotKey.GetIndex()].GetVersion());
+        return p_slotKey.Valid() && (p_slotKey.GetIndex() < m_slots.size() &&
+                                     p_slotKey.GetVersion() == m_slots[p_slotKey.GetIndex()].GetVersion());
     }
 
     [[nodiscard]]
diff --git a/Bigfoot/Sources/Utils/Include/Utils/Log/LogMacros.hpp b/Bigfoot/Sources/Utils/Include/Utils/Log/LogMacros.hpp
index 1a51b11..61e3cd7 100644
--- a/Bigfoot/Sources/Utils/Include/Utils/Log/LogMacros.hpp
+++ b/Bigfoot/Sources/Utils/Include/Utils/Log/LogMacros.hpp
@@ -13,13 +13,13 @@
 #define BIGFOOT_LOG_DEBUG(loggerName, fmt, ...)                                                                        \
     do                                                                                                                 \
     {                                                                                                                  \
-        if (::quill::Logger* logger = ::Bigfoot::Singleton<::Bigfoot::Log>::GetInstance().GetLogger(loggerName))          \
+        if (::quill::Logger* logger = ::Bigfoot::Singleton<::Bigfoot::Log>::GetInstance().GetLogger(loggerName))       \
         {                                                                                                              \
             QUILL_LOG_DEBUG(logger, fmt __VA_OPT__(, ) __VA_ARGS__);                                                   \
         }                                                                                                              \
         else                                                                                                           \
         {                                                                                                              \
-            QUILL_LOG_DEBUG(::Bigfoot::Singleton<::Bigfoot::Log>::GetInstance().RegisterLogger(loggerName),               \
+            QUILL_LOG_DEBUG(::Bigfoot::Singleton<::Bigfoot::Log>::GetInstance().RegisterLogger(loggerName),            \
                             fmt __VA_OPT__(, ) __VA_ARGS__);                                                           \
         }                                                                                                              \
     } while (0)
@@ -27,13 +27,13 @@
 #define BIGFOOT_LOG_TRACE(loggerName, fmt, ...)                                                                        \
     do                                                                                                                 \
     {                                                                                                                  \
-        if (::quill::Logger* logger = ::Bigfoot::Singleton<::Bigfoot::Log>::GetInstance().GetLogger(loggerName))          \
+        if (::quill::Logger* logger = ::Bigfoot::Singleton<::Bigfoot::Log>::GetInstance().GetLogger(loggerName))       \
         {                                                                                                              \
             QUILL_LOG_TRACE_L3(logger, fmt __VA_OPT__(, ) __VA_ARGS__);                                                \
         }                                                                                                              \
         else                                                                                                           \
         {                                                                                                              \
-            QUILL_LOG_TRACE_L3(::Bigfoot::Singleton<::Bigfoot::Log>::GetInstance().RegisterLogger(loggerName),            \
+            QUILL_LOG_TRACE_L3(::Bigfoot::Singleton<::Bigfoot::Log>::GetInstance().RegisterLogger(loggerName),         \
                                fmt __VA_OPT__(, ) __VA_ARGS__);                                                        \
         }                                                                                                              \
     } while (0)
@@ -41,13 +41,13 @@
 #define BIGFOOT_LOG_INFO(loggerName, fmt, ...)                                                                         \
     do                                                                                                                 \
     {                                                                                                                  \
-        if (::quill::Logger* logger = ::Bigfoot::Singleton<::Bigfoot::Log>::GetInstance().GetLogger(loggerName))          \
+        if (::quill::Logger* logger = ::Bigfoot::Singleton<::Bigfoot::Log>::GetInstance().GetLogger(loggerName))       \
         {                                                                                                              \
             QUILL_LOG_INFO(logger, fmt __VA_OPT__(, ) __VA_ARGS__);                                                    \
         }                                                                                                              \
         else                                                                                                           \
         {                                                                                                              \
-            QUILL_LOG_INFO(::Bigfoot::Singleton<::Bigfoot::Log>::GetInstance().RegisterLogger(loggerName),                \
+            QUILL_LOG_INFO(::Bigfoot::Singleton<::Bigfoot::Log>::GetInstance().RegisterLogger(loggerName),             \
                            fmt __VA_OPT__(, ) __VA_ARGS__);                                                            \
         }                                                                                                              \
     } while (0)
@@ -55,13 +55,13 @@
 #define BIGFOOT_LOG_WARN(loggerName, fmt, ...)                                                                         \
     do                                                                                                                 \
     {                                                                                                                  \
-        if (::quill::Logger* logger = ::Bigfoot::Singleton<::Bigfoot::Log>::GetInstance().GetLogger(loggerName))          \
+        if (::quill::Logger* logger = ::Bigfoot::Singleton<::Bigfoot::Log>::GetInstance().GetLogger(loggerName))       \
         {                                                                                                              \
             QUILL_LOG_WARNING(logger, fmt __VA_OPT__(, ) __VA_ARGS__);                                                 \
         }                                                                                                              \
         else                                                                                                           \
         {                                                                                                              \
-            QUILL_LOG_WARNING(::Bigfoot::Singleton<::Bigfoot::Log>::GetInstance().RegisterLogger(loggerName),             \
+            QUILL_LOG_WARNING(::Bigfoot::Singleton<::Bigfoot::Log>::GetInstance().RegisterLogger(loggerName),          \
                               fmt __VA_OPT__(, ) __VA_ARGS__);                                                         \
         }                                                                                                              \
     } while (0)
@@ -69,13 +69,13 @@
 #define BIGFOOT_LOG_ERROR(loggerName, fmt, ...)                                                                        \
     do                                                                                                                 \
     {                                                                                                                  \
-        if (::quill::Logger* logger = ::Bigfoot::Singleton<::Bigfoot::Log>::GetInstance().GetLogger(loggerName))          \
+        if (::quill::Logger* logger = ::Bigfoot::Singleton<::Bigfoot::Log>::GetInstance().GetLogger(loggerName))       \
         {                                                                                                              \
             QUILL_LOG_ERROR(logger, fmt __VA_OPT__(, ) __VA_ARGS__);                                                   \
         }                                                                                                              \
         else                                                                                                           \
         {                                                                                                              \
-            QUILL_LOG_ERROR(::Bigfoot::Singleton<::Bigfoot::Log>::GetInstance().RegisterLogger(loggerName),               \
+            QUILL_LOG_ERROR(::Bigfoot::Singleton<::Bigfoot::Log>::GetInstance().RegisterLogger(loggerName),            \
                             fmt __VA_OPT__(, ) __VA_ARGS__);                                                           \
         }                                                                                                              \
     } while (0)
@@ -83,13 +83,13 @@
 #define BIGFOOT_LOG_FATAL(loggerName, fmt, ...)                                                                        \
     do                                                                                                                 \
     {                                                                                                                  \
-        if (::quill::Logger* logger = ::Bigfoot::Singleton<::Bigfoot::Log>::GetInstance().GetLogger(loggerName))          \
+        if (::quill::Logger* logger = ::Bigfoot::Singleton<::Bigfoot::Log>::GetInstance().GetLogger(loggerName))       \
         {                                                                                                              \
             QUILL_LOG_CRITICAL(logger, fmt __VA_OPT__(, ) __VA_ARGS__);                                                \
         }                                                                                                              \
         else                                                                                                           \
         {                                                                                                              \
-            QUILL_LOG_CRITICAL(::Bigfoot::Singleton<::Bigfoot::Log>::GetInstance().RegisterLogger(loggerName),            \
+            QUILL_LOG_CRITICAL(::Bigfoot::Singleton<::Bigfoot::Log>::GetInstance().RegisterLogger(loggerName),         \
                                fmt __VA_OPT__(, ) __VA_ARGS__);                                                        \
         }                                                                                                              \
     } while (0)