diff --git a/Source/D3D11/CommandBufferEmuD3D11.hpp b/Source/D3D11/CommandBufferEmuD3D11.hpp
index 25c616e..b597cc3 100644
--- a/Source/D3D11/CommandBufferEmuD3D11.hpp
+++ b/Source/D3D11/CommandBufferEmuD3D11.hpp
@@ -747,4 +747,3 @@ NRI_INLINE void CommandBufferEmuD3D11::Annotation(const char* name, uint32_t bgr
     Push(m_PushBuffer, name, len);
     Push(m_PushBuffer, name, bgra);
 }
-
diff --git a/Source/D3D11/DeviceD3D11.h b/Source/D3D11/DeviceD3D11.h
index a2e3ab1..b9e707c 100644
--- a/Source/D3D11/DeviceD3D11.h
+++ b/Source/D3D11/DeviceD3D11.h
@@ -85,7 +85,7 @@ struct DeviceD3D11 final : public DeviceBase {
     // DeviceBase
     //================================================================================================================
 
-    inline const DeviceDesc& GetDesc() const  override{
+    inline const DeviceDesc& GetDesc() const override {
         return m_Desc;
     }
 
diff --git a/Source/D3D12/DeviceD3D12.h b/Source/D3D12/DeviceD3D12.h
index f5b1dd5..74a56d1 100644
--- a/Source/D3D12/DeviceD3D12.h
+++ b/Source/D3D12/DeviceD3D12.h
@@ -92,7 +92,7 @@ struct DeviceD3D12 final : public DeviceBase {
     // DeviceBase
     //================================================================================================================
 
-    inline const DeviceDesc& GetDesc() const override{
+    inline const DeviceDesc& GetDesc() const override {
         return m_Desc;
     }
 
diff --git a/Source/Shared/D3DExt.h b/Source/Shared/D3DExt.h
index 6ebc56b..c5d9c00 100644
--- a/Source/Shared/D3DExt.h
+++ b/Source/Shared/D3DExt.h
@@ -36,7 +36,7 @@ struct AgsFuncTable {
     AGS_DRIVEREXTENSIONSDX11_MULTIDRAWINSTANCEDINDIRECTCOUNTINDIRECT DrawIndirectCount;
     AGS_DRIVEREXTENSIONSDX11_MULTIDRAWINDEXEDINSTANCEDINDIRECTCOUNTINDIRECT DrawIndexedIndirectCount;
 
-#else
+#    else
 
     AGS_DRIVEREXTENSIONSDX12_CREATEDEVICE CreateDeviceD3D12;
     AGS_DRIVEREXTENSIONSDX12_DESTROYDEVICE DestroyDeviceD3D12;
diff --git a/Source/Shared/SharedExternal.h b/Source/Shared/SharedExternal.h
index 65df402..1e432a8 100644
--- a/Source/Shared/SharedExternal.h
+++ b/Source/Shared/SharedExternal.h
@@ -40,7 +40,7 @@ typedef nri::AllocationCallbacks AllocationCallbacks;
 
 // Annotations for NVIDIA Nsight Systems
 #if NRI_USE_NVTX
-    #include "NVTX/c/include/nvtx3/nvToolsExt.h"
+#    include "NVTX/c/include/nvtx3/nvToolsExt.h"
 #endif
 
 // Consts
diff --git a/Source/Shared/SharedExternal.hpp b/Source/Shared/SharedExternal.hpp
index 2a0bae9..7e67e77 100644
--- a/Source/Shared/SharedExternal.hpp
+++ b/Source/Shared/SharedExternal.hpp
@@ -793,9 +793,9 @@ nri::Format VKFormatToNRIFormat(uint32_t format) {
 }
 
 constexpr std::array<const char*, (size_t)nri::Message::MAX_NUM> MESSAGE_TYPE_NAME = {
-    "INFO",     // INFO,
-    "WARNING",  // WARNING,
-    "ERROR",    // ERROR
+    "INFO",    // INFO,
+    "WARNING", // WARNING,
+    "ERROR",   // ERROR
 };
 
 static void MessageCallback(nri::Message messageType, const char* file, uint32_t line, const char* message, void* userArg) {
diff --git a/Source/VK/DescriptorSetVK.hpp b/Source/VK/DescriptorSetVK.hpp
index dcdba64..076cfff 100644
--- a/Source/VK/DescriptorSetVK.hpp
+++ b/Source/VK/DescriptorSetVK.hpp
@@ -173,7 +173,7 @@ NRI_INLINE void DescriptorSetVK::UpdateDescriptorRanges(uint32_t rangeOffset, ui
     uint32_t writeMaxNum = std::min<uint32_t>(writesPerIteration, rangeNum);
     Scratch<VkWriteDescriptorSet> writes = AllocateScratch(m_Device, VkWriteDescriptorSet, writeMaxNum);
 
-    Scratch<uint8_t> slabScratch = AllocateScratch(m_Device, uint8_t, slabSize); 
+    Scratch<uint8_t> slabScratch = AllocateScratch(m_Device, uint8_t, slabSize);
     SlabAllocator slab(slabScratch, slabSize);
 
     uint32_t j = 0;
diff --git a/Source/VK/DeviceVK.h b/Source/VK/DeviceVK.h
index 9032d6f..d88a2c4 100644
--- a/Source/VK/DeviceVK.h
+++ b/Source/VK/DeviceVK.h
@@ -91,7 +91,7 @@ struct DeviceVK final : public DeviceBase {
     // DeviceBase
     //================================================================================================================
 
-    inline const DeviceDesc& GetDesc() const override{
+    inline const DeviceDesc& GetDesc() const override {
         return m_Desc;
     }
 
diff --git a/Source/Validation/DeviceVal.h b/Source/Validation/DeviceVal.h
index 8a7c05a..634f15a 100644
--- a/Source/Validation/DeviceVal.h
+++ b/Source/Validation/DeviceVal.h
@@ -78,8 +78,8 @@ struct DeviceVal final : public DeviceBase {
     //================================================================================================================
     // DeviceBase
     //================================================================================================================
-    
-    const DeviceDesc& GetDesc() const override{
+
+    const DeviceDesc& GetDesc() const override {
         return ((DeviceBase&)m_Device).GetDesc();
     }
 
diff --git a/Source/Validation/SharedVal.h b/Source/Validation/SharedVal.h
index 30661ad..ca77b87 100644
--- a/Source/Validation/SharedVal.h
+++ b/Source/Validation/SharedVal.h
@@ -84,15 +84,15 @@ inline DeviceVal& GetDeviceVal(T& object) {
 uint64_t GetMemorySizeD3D12(const MemoryD3D12Desc& memoryD3D12Desc);
 
 constexpr std::array<const char*, (size_t)nri::DescriptorType::MAX_NUM> DESCRIPTOR_TYPE_NAME = {
-    "SAMPLER",                      // SAMPLER,
-    "CONSTANT_BUFFER",              // CONSTANT_BUFFER,
-    "TEXTURE",                      // TEXTURE,
-    "STORAGE_TEXTURE",              // STORAGE_TEXTURE,
-    "BUFFER",                       // BUFFER,
-    "STORAGE_BUFFER",               // STORAGE_BUFFER,
-    "STRUCTURED_BUFFER",            // STRUCTURED_BUFFER,
-    "STORAGE_STRUCTURED_BUFFER",    // STORAGE_STRUCTURED_BUFFER,
-    "ACCELERATION_STRUCTURE",       // ACCELERATION_STRUCTURE
+    "SAMPLER",                   // SAMPLER,
+    "CONSTANT_BUFFER",           // CONSTANT_BUFFER,
+    "TEXTURE",                   // TEXTURE,
+    "STORAGE_TEXTURE",           // STORAGE_TEXTURE,
+    "BUFFER",                    // BUFFER,
+    "STORAGE_BUFFER",            // STORAGE_BUFFER,
+    "STRUCTURED_BUFFER",         // STRUCTURED_BUFFER,
+    "STORAGE_STRUCTURED_BUFFER", // STORAGE_STRUCTURED_BUFFER,
+    "ACCELERATION_STRUCTURE",    // ACCELERATION_STRUCTURE
 };
 
 constexpr const char* GetDescriptorTypeName(nri::DescriptorType descriptorType) {