diff --git a/io/include/traccc/io/csv/cell.hpp b/io/include/traccc/io/csv/cell.hpp
index 7884b261f6..d935f7839c 100644
--- a/io/include/traccc/io/csv/cell.hpp
+++ b/io/include/traccc/io/csv/cell.hpp
@@ -25,7 +25,7 @@ struct cell {
     float timestamp = 0.;
     float value = 0.;
 
-    //auto operator<=>(const cell& other) const = default;
+    // auto operator<=>(const cell& other) const = default;
 
     // geometry_id,measurement_id,channel0,channel1,timestamp,value
     DFE_NAMEDTUPLE(cell, geometry_id, measurement_id, channel0, channel1,
diff --git a/io/src/csv/cell.cpp b/io/src/csv/cell.cpp
index b0f4451302..018190e81c 100644
--- a/io/src/csv/cell.cpp
+++ b/io/src/csv/cell.cpp
@@ -17,7 +17,7 @@ bool operator<(const cell& lhs, const cell& rhs) {
         return (lhs.channel1 < rhs.channel1);
     } else {
         return (lhs.channel0 < rhs.channel0);
-    } 
+    }
 }
 
 }  // namespace traccc::io::csv
diff --git a/tests/cuda/test_ckf_combinatorics_telescope.cpp b/tests/cuda/test_ckf_combinatorics_telescope.cpp
index d420976f9d..dfd19fc41d 100644
--- a/tests/cuda/test_ckf_combinatorics_telescope.cpp
+++ b/tests/cuda/test_ckf_combinatorics_telescope.cpp
@@ -9,10 +9,10 @@
 #include "traccc/cuda/finding/finding_algorithm.hpp"
 #include "traccc/device/container_d2h_copy_alg.hpp"
 #include "traccc/device/container_h2d_copy_alg.hpp"
-#include "traccc/utils/event_data.hpp"
 #include "traccc/io/read_measurements.hpp"
 #include "traccc/io/utils.hpp"
 #include "traccc/simulation/simulator.hpp"
+#include "traccc/utils/event_data.hpp"
 #include "traccc/utils/ranges.hpp"
 
 // Test include(s).
diff --git a/tests/cuda/test_ckf_toy_detector.cpp b/tests/cuda/test_ckf_toy_detector.cpp
index b3450d598a..17278e83b4 100644
--- a/tests/cuda/test_ckf_toy_detector.cpp
+++ b/tests/cuda/test_ckf_toy_detector.cpp
@@ -10,11 +10,11 @@
 #include "traccc/device/container_d2h_copy_alg.hpp"
 #include "traccc/device/container_h2d_copy_alg.hpp"
 #include "traccc/finding/finding_algorithm.hpp"
-#include "traccc/utils/event_data.hpp"
 #include "traccc/io/read_measurements.hpp"
 #include "traccc/io/utils.hpp"
 #include "traccc/performance/container_comparator.hpp"
 #include "traccc/simulation/simulator.hpp"
+#include "traccc/utils/event_data.hpp"
 #include "traccc/utils/ranges.hpp"
 
 // Test include(s).
diff --git a/tests/io/test_event_data.cpp b/tests/io/test_event_data.cpp
index 9e4d111035..6c09671d46 100644
--- a/tests/io/test_event_data.cpp
+++ b/tests/io/test_event_data.cpp
@@ -9,11 +9,11 @@
 #include "traccc/clusterization/measurement_creation_algorithm.hpp"
 #include "traccc/clusterization/sparse_ccl_algorithm.hpp"
 #include "traccc/io/data_format.hpp"
-#include "traccc/utils/event_data.hpp"
 #include "traccc/io/read_cells.hpp"
 #include "traccc/io/read_detector_description.hpp"
 #include "traccc/io/read_digitization_config.hpp"
 #include "traccc/io/utils.hpp"
+#include "traccc/utils/event_data.hpp"
 
 // VecMem include(s).
 #include <vecmem/memory/host_memory_resource.hpp>