diff --git a/include/dwarfs/writer/compression_metadata_requirements.h b/include/dwarfs/writer/compression_metadata_requirements.h
index ea4f60d5..0c089d99 100644
--- a/include/dwarfs/writer/compression_metadata_requirements.h
+++ b/include/dwarfs/writer/compression_metadata_requirements.h
@@ -304,28 +304,28 @@ class compression_metadata_requirements {
   template <
       typename F, typename U,
       typename T = typename std::invoke_result_t<F, nlohmann::json>::value_type>
-  void add_set(std::string const& name, U(Meta::*mp), F&& value_parser) {
+  void add_set(std::string const& name, U(Meta::* mp), F&& value_parser) {
     req_.emplace_back(
         std::make_unique<detail::metadata_requirement_set<Meta, T, U>>(
             name, mp, std::forward<F>(value_parser)));
   }
 
   template <typename T, typename U>
-  void add_set(std::string const& name, U(Meta::*mp)) {
+  void add_set(std::string const& name, U(Meta::* mp)) {
     add_set(name, mp, detail::value_parser<T>);
   }
 
   template <
       typename F, typename U,
       typename T = typename std::invoke_result_t<F, nlohmann::json>::value_type>
-  void add_range(std::string const& name, U(Meta::*mp), F&& value_parser) {
+  void add_range(std::string const& name, U(Meta::* mp), F&& value_parser) {
     req_.emplace_back(
         std::make_unique<detail::metadata_requirement_range<Meta, T, U>>(
             name, mp, std::forward<F>(value_parser)));
   }
 
   template <typename T, typename U>
-  void add_range(std::string const& name, U(Meta::*mp)) {
+  void add_range(std::string const& name, U(Meta::* mp)) {
     add_range(name, mp, detail::value_parser<T>);
   }
 
diff --git a/src/writer/filesystem_writer.cpp b/src/writer/filesystem_writer.cpp
index ee4f838e..a6af6cac 100644
--- a/src/writer/filesystem_writer.cpp
+++ b/src/writer/filesystem_writer.cpp
@@ -1002,8 +1002,8 @@ void filesystem_writer_<LoggerPolicy>::add_section_compressor(
 
 template <typename LoggerPolicy>
 auto filesystem_writer_<LoggerPolicy>::get_compression_constraints(
-    fragment_category::value_type cat,
-    std::string const& metadata) const -> compression_constraints {
+    fragment_category::value_type cat, std::string const& metadata) const
+    -> compression_constraints {
   return compressor_for_category(cat).get_compression_constraints(metadata);
 }
 
diff --git a/src/writer/internal/inode_manager.cpp b/src/writer/internal/inode_manager.cpp
index 34c4a7e5..996553b3 100644
--- a/src/writer/internal/inode_manager.cpp
+++ b/src/writer/internal/inode_manager.cpp
@@ -754,8 +754,9 @@ void inode_manager_<LoggerPolicy>::dump(std::ostream& os) const {
 }
 
 template <typename LoggerPolicy>
-auto inode_manager_<LoggerPolicy>::ordered_span(
-    fragment_category cat, worker_group& wg) const -> sortable_inode_span {
+auto inode_manager_<LoggerPolicy>::ordered_span(fragment_category cat,
+                                                worker_group& wg) const
+    -> sortable_inode_span {
   auto prefix = category_prefix(opts_.categorizer_mgr, cat);
   auto opts = opts_.fragment_order.get(cat);
 
diff --git a/src/writer/internal/similarity_ordering.cpp b/src/writer/internal/similarity_ordering.cpp
index e818f575..4d9adf2b 100644
--- a/src/writer/internal/similarity_ordering.cpp
+++ b/src/writer/internal/similarity_ordering.cpp
@@ -330,8 +330,8 @@ auto similarity_ordering_<LoggerPolicy>::build_index(
 
 template <typename LoggerPolicy>
 auto similarity_ordering_<LoggerPolicy>::find_duplicates(
-    similarity_element_view const& ev,
-    index_type& index) const -> duplicates_map {
+    similarity_element_view const& ev, index_type& index) const
+    -> duplicates_map {
   duplicates_map dm;
 
   {