diff --git a/GPU/Common/GPUCommonDefAPI.h b/GPU/Common/GPUCommonDefAPI.h
index d38dcf86cf9ff..bdf50f4feace0 100644
--- a/GPU/Common/GPUCommonDefAPI.h
+++ b/GPU/Common/GPUCommonDefAPI.h
@@ -295,5 +295,5 @@
   #define get_group_id(dim) iBlock
 #endif
 
-// clang-format on
+    // clang-format on
 #endif
diff --git a/GPU/Common/GPUCommonDouble.h b/GPU/Common/GPUCommonDouble.h
index 2f7108b409a7e..88232d0b89915 100644
--- a/GPU/Common/GPUCommonDouble.h
+++ b/GPU/Common/GPUCommonDouble.h
@@ -34,7 +34,7 @@ static_assert(alignof(double) == 8, "the emulated double must match the alignmen
 template <>
 GPUhdi() constexpr double GPUCommonMath::Abs<double>(double x)
 {
-  return double::fromBits(x.bits() & ~GPUCA_B64_SIGN);
+  return double ::fromBits(x.bits() & ~GPUCA_B64_SIGN);
 }
 
 // metal::fabs is not constant-evaluable, so this also fails to compile if the
diff --git a/GPU/Common/GPUCommonMath.h b/GPU/Common/GPUCommonMath.h
index 8ab250f4cfd98..3f6af1d0ef7cd 100644
--- a/GPU/Common/GPUCommonMath.h
+++ b/GPU/Common/GPUCommonMath.h
@@ -481,9 +481,15 @@ GPUhdi() constexpr int32_t GPUCommonMath::Abs<int32_t>(int32_t x)
 // has the same size and alignment; the overloads keep the address space, which a
 // generic pointer would not carry into atomic_*_explicit.
 template <class T>
-GPUdi() threadgroup metal::atomic<T>* GPUCommonMathMetalAtomic(threadgroup T* p) { return reinterpret_cast<threadgroup metal::atomic<T>*>(p); }
+GPUdi() threadgroup metal::atomic<T>* GPUCommonMathMetalAtomic(threadgroup T* p)
+{
+  return reinterpret_cast<threadgroup metal::atomic<T>*>(p);
+}
 template <class T>
-GPUdi() device metal::atomic<T>* GPUCommonMathMetalAtomic(T* p) { return (device metal::atomic<T>*)p; }
+GPUdi() device metal::atomic<T>* GPUCommonMathMetalAtomic(T* p)
+{
+  return (device metal::atomic<T>*)p;
+}
 #endif
 
 template <class S, class T>
diff --git a/GPU/GPUTracking/Base/GPUReconstructionKernelMacros.h b/GPU/GPUTracking/Base/GPUReconstructionKernelMacros.h
index 0887cadd7338d..34b3bea076ac5 100644
--- a/GPU/GPUTracking/Base/GPUReconstructionKernelMacros.h
+++ b/GPU/GPUTracking/Base/GPUReconstructionKernelMacros.h
@@ -91,4 +91,4 @@
 #define GPUCA_KRNL_LB(x_class, x_attributes, ...) GPUCA_KRNL(x_class, (REG, (GPUCA_M_CAT(GPUCA_LB_, GPUCA_M_KRNL_NAME(x_class))), GPUCA_M_STRIP(x_attributes)), __VA_ARGS__)
 
 #endif // O2_GPU_GPURECONSTRUCTIONKERNELMACROS_H
-// clang-format on
+  // clang-format on
diff --git a/GPU/GPUTracking/Base/metal/GPUReconstructionMetal.mm b/GPU/GPUTracking/Base/metal/GPUReconstructionMetal.mm
index 8448a9d86184b..0fb42452e6a05 100644
--- a/GPU/GPUTracking/Base/metal/GPUReconstructionMetal.mm
+++ b/GPU/GPUTracking/Base/metal/GPUReconstructionMetal.mm
@@ -399,7 +399,8 @@
 
   // the section is part of the mapped image, so it outlives the dispatch_data_t
   // and does not have to be copied
-  dispatch_data_t blob = dispatch_data_create(p, sz, nullptr, ^{});
+  dispatch_data_t blob = dispatch_data_create(p, sz, nullptr, ^{
+                                                     });
 
   NSError* error = nil;
   mInternals->library = [mInternals->device newLibraryWithData:blob error:&error];
diff --git a/GPU/GPUTracking/TPCClusterFinder/CfChargePos.h b/GPU/GPUTracking/TPCClusterFinder/CfChargePos.h
index 64aa0f6fcfe6d..eb41dac2328ea 100644
--- a/GPU/GPUTracking/TPCClusterFinder/CfChargePos.h
+++ b/GPU/GPUTracking/TPCClusterFinder/CfChargePos.h
@@ -38,7 +38,8 @@ struct CfChargePos {
   // INVALID_CHARGE_POS below lives in the constant address space, which a
   // generic `this` does not reach in MSL.
   constexpr GPUhdi() CfChargePos(tpccf::Row row, tpccf::Pad pad, tpccf::TPCFragmentTime t) constant
-    : gpad(tpcGlobalPadIdx(row, pad)), timePadded(t + GPUCF_PADDING_TIME)
+    : gpad(tpcGlobalPadIdx(row, pad)),
+      timePadded(t + GPUCF_PADDING_TIME)
   {
   }
 #endif