diff --git a/openVulkanoCpp/Base/EngineConfiguration.hpp b/openVulkanoCpp/Base/EngineConfiguration.hpp
index e803bd1..867a522 100644
--- a/openVulkanoCpp/Base/EngineConfiguration.hpp
+++ b/openVulkanoCpp/Base/EngineConfiguration.hpp
@@ -18,45 +18,45 @@ namespace OpenVulkano
 		EngineConfiguration() = default;
 		~EngineConfiguration() = default;
 
-		uint32_t numThreads = 1;
-		std::array<float, 4> frameBufferClearColor = { 0.39f, 0.58f, 0.93f, 1.0f };
-		bool preferFramebufferFormatSRGB = true;
+		uint32_t m_numThreads = 1;
+		std::array<float, 4> m_frameBufferClearColor = { 0.39f, 0.58f, 0.93f, 1.0f };
+		bool m_preferFramebufferFormatSRGB = true;
 
 	public:
 		[[nodiscard]] static EngineConfiguration* GetEngineConfiguration()
 		{
-			static EngineConfiguration* config = new EngineConfiguration();
-			return config;
+			static EngineConfiguration config;
+			return &config;
 		}
 
 		void SetNumThreads(uint32_t numThreads)
 		{
-			this->numThreads = numThreads;
+			m_numThreads = numThreads;
 		}
 
 		[[nodiscard]] uint32_t GetNumThreads() const
 		{
-			return std::max(static_cast<uint32_t>(1), numThreads);
+			return std::max(static_cast<uint32_t>(1), m_numThreads);
 		}
 
 		void SetFrameBufferClearColor(std::array<float, 4> frameBufferClearColor)
 		{
-			this->frameBufferClearColor = frameBufferClearColor;
+			m_frameBufferClearColor = frameBufferClearColor;
 		}
 
 		[[nodiscard]] const std::array<float, 4>& GetFrameBufferClearColor() const
 		{
-			return frameBufferClearColor;
+			return m_frameBufferClearColor;
 		}
 
 		[[nodiscard]] bool GetPreferFramebufferFormatSRGB() const
 		{
-			return preferFramebufferFormatSRGB;
+			return m_preferFramebufferFormatSRGB;
 		}
 
 		void SetPreferFramebufferFormatSRGB(bool sRGB)
 		{
-			preferFramebufferFormatSRGB = sRGB;
+			m_preferFramebufferFormatSRGB = sRGB;
 		}
 	};
 }
\ No newline at end of file