diff --git a/ALICE3/Core/DetLayer.h b/ALICE3/Core/DetLayer.h
index c70901c46c8..6b9fea14c06 100644
--- a/ALICE3/Core/DetLayer.h
+++ b/ALICE3/Core/DetLayer.h
@@ -43,7 +43,7 @@ struct DetLayer {
   // efficiency
   float eff; // detection efficiency
 
-  // layer type 
+  // layer type
   int type; // 0: undefined/inert, 1: silicon, 2: gas/tpc
 };
 
diff --git a/ALICE3/Core/FastTracker.cxx b/ALICE3/Core/FastTracker.cxx
index 23ec0035eb5..715ed9343e2 100644
--- a/ALICE3/Core/FastTracker.cxx
+++ b/ALICE3/Core/FastTracker.cxx
@@ -179,7 +179,7 @@ int FastTracker::FastTrack(o2::track::TrackParCov inputTrack, o2::track::TrackPa
     // check if layer is doable
     if (layers[il].r < initialRadius)
       continue; // this layer should not be attempted, but go ahead
-    if(layers[il].type==0)
+    if (layers[il].type == 0)
       continue; // inert layer, skip
 
     // check if layer is reached
@@ -247,7 +247,7 @@ int FastTracker::FastTrack(o2::track::TrackParCov inputTrack, o2::track::TrackPa
   // +-~-<*>-~-+-~-<*>-~-+-~-<*>-~-+-~-<*>-~-+-~-<*>-~-+
   // Inward pass to calculate covariances
   for (int il = lastLayerReached; il >= firstLayerReached; il--) {
-    if(layers[il].type==0)
+    if (layers[il].type == 0)
       continue; // inert layer, skip
 
     float targetX = 1e+3;
@@ -283,9 +283,9 @@ int FastTracker::FastTrack(o2::track::TrackParCov inputTrack, o2::track::TrackPa
     outputTrack.update(hitpoint, hitpointcov);
     outputTrack.checkCovariance();
 
-    if(layers[il].type==1)
+    if (layers[il].type == 1)
       nSiliconPoints++; // count silicon hits
-    if(layers[il].type==2)
+    if (layers[il].type == 2)
       nGasPoints++; // count TPC/gas hits
 
     hits.push_back(thisHit);
diff --git a/ALICE3/DataModel/tracksAlice3.h b/ALICE3/DataModel/tracksAlice3.h
index aa32c5f607f..280c5ccb110 100644
--- a/ALICE3/DataModel/tracksAlice3.h
+++ b/ALICE3/DataModel/tracksAlice3.h
@@ -26,9 +26,9 @@ namespace o2::aod
 {
 namespace track_alice3
 {
-DECLARE_SOA_COLUMN(IsReconstructed, isReconstructed, bool);  //! is reconstructed or not
-DECLARE_SOA_COLUMN(NSiliconHits, nSiliconHits, int);         //! number of silicon hits
-DECLARE_SOA_COLUMN(NTPCHits, nTPCHits, int);                 //! number of tpc hits
+DECLARE_SOA_COLUMN(IsReconstructed, isReconstructed, bool); //! is reconstructed or not
+DECLARE_SOA_COLUMN(NSiliconHits, nSiliconHits, int);        //! number of silicon hits
+DECLARE_SOA_COLUMN(NTPCHits, nTPCHits, int);                //! number of tpc hits
 } // namespace track_alice3
 DECLARE_SOA_TABLE(TracksAlice3, "AOD", "TRACKSALICE3",
                   track_alice3::IsReconstructed);
diff --git a/ALICE3/TableProducer/OTF/onTheFlyTracker.cxx b/ALICE3/TableProducer/OTF/onTheFlyTracker.cxx
index c04ad933d3c..6a150eaac60 100644
--- a/ALICE3/TableProducer/OTF/onTheFlyTracker.cxx
+++ b/ALICE3/TableProducer/OTF/onTheFlyTracker.cxx
@@ -163,28 +163,28 @@ struct OnTheFlyTracker {
     TrackAlice3() = default;
     ~TrackAlice3() = default;
     TrackAlice3(const TrackAlice3& src) = default;
-    TrackAlice3(const o2::track::TrackParCov& src, const int64_t label, 
-    const float t = 0, 
-    const float te = 1, 
-    bool decayDauInput = false, 
-    bool weakDecayDauInput = false, 
-    int isUsedInCascadingInput = 0,
-    int nSiliconHitsInput = 0,
-    int nTPCHitsInput = 0) : o2::track::TrackParCov(src),
-                                                                 mcLabel{label},
-                                                                 timeEst{t, te},
-                                                                 isDecayDau(decayDauInput),
-                                                                 isWeakDecayDau(weakDecayDauInput),
-                                                                 isUsedInCascading(isUsedInCascadingInput),
-                                                                 nSiliconHits(nSiliconHitsInput),
-                                                                 nTPCHits(nTPCHitsInput) {}
+    TrackAlice3(const o2::track::TrackParCov& src, const int64_t label,
+                const float t = 0,
+                const float te = 1,
+                bool decayDauInput = false,
+                bool weakDecayDauInput = false,
+                int isUsedInCascadingInput = 0,
+                int nSiliconHitsInput = 0,
+                int nTPCHitsInput = 0) : o2::track::TrackParCov(src),
+                                         mcLabel{label},
+                                         timeEst{t, te},
+                                         isDecayDau(decayDauInput),
+                                         isWeakDecayDau(weakDecayDauInput),
+                                         isUsedInCascading(isUsedInCascadingInput),
+                                         nSiliconHits(nSiliconHitsInput),
+                                         nTPCHits(nTPCHitsInput) {}
     const TimeEst& getTimeMUS() const { return timeEst; }
     int64_t mcLabel;
     TimeEst timeEst; ///< time estimate in ns
     bool isDecayDau;
     bool isWeakDecayDau;
     int isUsedInCascading; // 0: not at all, 1: is a cascade, 2: is a bachelor, 3: is a pion, 4: is a proton
-    int nSiliconHits; 
+    int nSiliconHits;
     int nTPCHits;
   };
 
@@ -634,9 +634,9 @@ struct OnTheFlyTracker {
       std::vector<o2::track::TrackParCov> xiDaughterTrackParCovsPerfect(3);
       std::vector<o2::track::TrackParCov> xiDaughterTrackParCovsTracked(3);
       std::vector<bool> isReco(3);
-      std::vector<int> nHits(3); // total
+      std::vector<int> nHits(3);        // total
       std::vector<int> nSiliconHits(3); // silicon type
-      std::vector<int> nTPCHits(3); // TPC type
+      std::vector<int> nTPCHits(3);     // TPC type
       std::vector<o2::delphes::DelphesO2TrackSmearer> smearer = {mSmearer0, mSmearer1, mSmearer2, mSmearer3, mSmearer4, mSmearer5};
       if (treatXi && mcParticle.pdgCode() == 3312) {
         histos.fill(HIST("hXiBuilding"), 0.0f);