diff --git a/include/sparrow/layout/null_array.hpp b/include/sparrow/layout/null_array.hpp
index c2f8cf4b..77b5b13e 100644
--- a/include/sparrow/layout/null_array.hpp
+++ b/include/sparrow/layout/null_array.hpp
@@ -138,7 +138,7 @@ namespace sparrow
         friend class detail::array_access;
     };
 
-    SPARROW_API 
+    SPARROW_API
     bool operator==(const null_array& lhs, const null_array& rhs);
 
     /*********************************
diff --git a/include/sparrow/layout/union_array.hpp b/include/sparrow/layout/union_array.hpp
index 418119e0..0fc2eb76 100644
--- a/include/sparrow/layout/union_array.hpp
+++ b/include/sparrow/layout/union_array.hpp
@@ -197,7 +197,7 @@ namespace sparrow
             std::vector<array>&& children,
             type_id_buffer_type&& element_type,
             offset_buffer_type&& offsets,
-            std::string&& format, 
+            std::string&& format,
             type_id_map&& tim,
             std::optional<std::string_view> name = std::nullopt,
             std::optional<std::string_view> metadata = std::nullopt
@@ -530,7 +530,8 @@ namespace sparrow
             std::move(format),
             std::move(type_id_to_child_index),
             std::move(name),
-            std::move(metadata));
+            std::move(metadata)
+        );
     }
 
     /*************************************
diff --git a/src/layout/list_layout/list_value.cpp b/src/layout/list_layout/list_value.cpp
index b413e736..e1bb4e09 100644
--- a/src/layout/list_layout/list_value.cpp
+++ b/src/layout/list_layout/list_value.cpp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 #include "sparrow/layout/list_layout/list_value.hpp"
+
 #include "sparrow/layout/dispatch.hpp"
 
 namespace sparrow
diff --git a/src/layout/null_array.cpp b/src/layout/null_array.cpp
index 5664d10f..246a227f 100644
--- a/src/layout/null_array.cpp
+++ b/src/layout/null_array.cpp
@@ -16,11 +16,7 @@
 
 namespace sparrow
 {
-    null_array::null_array(
-        size_t length,
-        std::optional<std::string_view> name,
-        std::optional<std::string_view> metadata
-    )
+    null_array::null_array(size_t length, std::optional<std::string_view> name, std::optional<std::string_view> metadata)
         : m_proxy(create_proxy(length, std::move(name), std::move(metadata)))
     {
     }
@@ -170,4 +166,3 @@ namespace sparrow
         return lhs.size() == rhs.size();
     }
 }
-
diff --git a/src/layout/run_end_encoded_layout/run_end_encoded_array.cpp b/src/layout/run_end_encoded_layout/run_end_encoded_array.cpp
index 6635c954..f3b05cb7 100644
--- a/src/layout/run_end_encoded_layout/run_end_encoded_array.cpp
+++ b/src/layout/run_end_encoded_layout/run_end_encoded_array.cpp
@@ -290,8 +290,10 @@ namespace sparrow
 
 #if defined(__cpp_lib_format)
 
-auto std::formatter<sparrow::run_end_encoded_array>::format(const sparrow::run_end_encoded_array& ar, std::format_context& ctx) const
-    -> decltype(ctx.out())
+auto std::formatter<sparrow::run_end_encoded_array>::format(
+    const sparrow::run_end_encoded_array& ar,
+    std::format_context& ctx
+) const -> decltype(ctx.out())
 {
     std::format_to(ctx.out(), "Run end encoded [size={}] <", ar.size());
 
diff --git a/src/layout/struct_layout/struct_array.cpp b/src/layout/struct_layout/struct_array.cpp
index 4dda7f07..3fd34eec 100644
--- a/src/layout/struct_layout/struct_array.cpp
+++ b/src/layout/struct_layout/struct_array.cpp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 #include "sparrow/layout/struct_layout/struct_array.hpp"
+
 #include "sparrow/utils/format.hpp"
 
 namespace sparrow
@@ -103,8 +104,10 @@ namespace sparrow
 
 #if defined(__cpp_lib_format)
 
-auto std::formatter<sparrow::struct_array>::format(const sparrow::struct_array& struct_array, std::format_context& ctx) const
-    -> decltype(ctx.out())
+auto std::formatter<sparrow::struct_array>::format(
+    const sparrow::struct_array& struct_array,
+    std::format_context& ctx
+) const -> decltype(ctx.out())
 {
     const auto get_names = [](const sparrow::struct_array& sa) -> std::vector<std::string>
     {
@@ -150,4 +153,3 @@ namespace sparrow
 }
 
 #endif
-
diff --git a/src/layout/union_array.cpp b/src/layout/union_array.cpp
index 335210ab..bec3e30c 100644
--- a/src/layout/union_array.cpp
+++ b/src/layout/union_array.cpp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 #include "sparrow/layout/union_array.hpp"
+
 #include "sparrow/array.hpp"
 
 namespace sparrow
@@ -60,7 +61,7 @@ namespace sparrow
         std::vector<array>&& children,
         type_id_buffer_type&& element_type,
         offset_buffer_type&& offsets,
-        std::string&& format, 
+        std::string&& format,
         type_id_map&& tim,
         std::optional<std::string_view> name,
         std::optional<std::string_view> metadata
@@ -121,7 +122,6 @@ namespace sparrow
         return arrow_proxy{std::move(arr), std::move(schema)};
     }
 
- 
     /*************************************
      * sparse_union_array implementation *
      *************************************/
@@ -194,4 +194,3 @@ namespace sparrow
         return arrow_proxy{std::move(arr), std::move(schema)};
     }
 }
-