diff --git a/ALICE3/DataModel/A3DecayFinderTables.h b/ALICE3/DataModel/A3DecayFinderTables.h
index 05e68290aa9..0dc34cc4f7e 100644
--- a/ALICE3/DataModel/A3DecayFinderTables.h
+++ b/ALICE3/DataModel/A3DecayFinderTables.h
@@ -63,7 +63,7 @@ DECLARE_SOA_INDEX_COLUMN(Collision, collision); //!
 DECLARE_SOA_COLUMN(XSecondaryVertex, xSecondaryVertex, double); //!
 DECLARE_SOA_COLUMN(YSecondaryVertex, ySecondaryVertex, double); //!
 DECLARE_SOA_COLUMN(ZSecondaryVertex, zSecondaryVertex, double); //!
-DECLARE_SOA_DYNAMIC_COLUMN(RSecondaryVertex, rSecondaryVertex, //!
+DECLARE_SOA_DYNAMIC_COLUMN(RSecondaryVertex, rSecondaryVertex,  //!
                            [](float xVtxS, float yVtxS) -> float { return RecoDecay::sqrtSumOfSquares(xVtxS, yVtxS); });
 DECLARE_SOA_COLUMN(Chi2PCA, chi2PCA, float); //! sum of (non-weighted) distances of the secondary vertex to its prongs
 // Prong index columns
@@ -323,8 +323,8 @@ DECLARE_SOA_DYNAMIC_COLUMN(M, m,
                                                                                              m); });
 DECLARE_SOA_DYNAMIC_COLUMN(E, e, //!
                            [](float px, float py, float pz, const float m) -> float { return RecoDecay::e(px, py, pz, m); });
-DECLARE_SOA_COLUMN(Eta, eta, float);            //!
-DECLARE_SOA_COLUMN(Phi, phi, float);            //!
+DECLARE_SOA_COLUMN(Eta, eta, float); //!
+DECLARE_SOA_COLUMN(Phi, phi, float); //!
 DECLARE_SOA_DYNAMIC_COLUMN(Y, y,
                            [](float px, float py, float pz, const float m) -> float { return RecoDecay::y(std::array{px, py, pz}, m); });
 } // namespace a3_hf_cand_3prong
diff --git a/ALICE3/ML/Alice3MlResponse3Prong.h b/ALICE3/ML/Alice3MlResponse3Prong.h
index c3b610185bb..14025d5cb60 100644
--- a/ALICE3/ML/Alice3MlResponse3Prong.h
+++ b/ALICE3/ML/Alice3MlResponse3Prong.h
@@ -223,4 +223,4 @@ class Alice3MlResponse3Prong : public MlResponse<TypeOutputScore>
 #undef FILL_MAP_3PRONG
 #undef CHECK_AND_FILL_ML_ALICE3
 
-#endif  // ALICE3_MLRESPONSE3PRONG_H_
\ No newline at end of file
+#endif // ALICE3_MLRESPONSE3PRONG_H_
diff --git a/ALICE3/TableProducer/alice3-decayfinder.cxx b/ALICE3/TableProducer/alice3-decayfinder.cxx
index c3afedf5558..240bfd934bd 100644
--- a/ALICE3/TableProducer/alice3-decayfinder.cxx
+++ b/ALICE3/TableProducer/alice3-decayfinder.cxx
@@ -17,25 +17,6 @@
 //    HF decays. Work in progress: use at your own risk!
 //
 
-#include <cmath>
-#include <array>
-#include <cstdlib>
-#include <map>
-#include <iterator>
-#include <utility>
-#include <vector>
-#include <algorithm>
-
-#include "Framework/runDataProcessing.h"
-#include "Framework/RunningWorkflowInfo.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "ReconstructionDataFormats/Track.h"
-#include "Common/Core/RecoDecay.h"
-#include "Common/Core/trackUtilities.h"
-
 #include "ALICE3/DataModel/A3DecayFinderTables.h"
 #include "ALICE3/DataModel/OTFPIDTrk.h"
 #include "ALICE3/DataModel/OTFRICH.h"
@@ -61,12 +42,14 @@
 #include "Framework/runDataProcessing.h"
 #include "ReconstructionDataFormats/Track.h"
 
+#include <algorithm>
 #include <array>
 #include <cmath>
 #include <cstdlib>
 #include <iterator>
 #include <map>
 #include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
@@ -104,7 +87,7 @@ struct alice3decayFinder {
   Configurable<double> minParamChange{"minParamChange", 1.e-3, "stop iterations if largest change of any X is smaller than this"};
   Configurable<double> minRelChi2Change{"minRelChi2Change", 0.9, "stop iterations is chi2/chi2old > this"};
   // Operation and minimisation criteria
-  Configurable<float> magneticField{"magneticField", 20.0f, "Magnetic field (in kilogauss)"}; 
+  Configurable<float> magneticField{"magneticField", 20.0f, "Magnetic field (in kilogauss)"};
   Configurable<bool> doDCAplotsD{"doDCAplotsD", true, "do daughter prong DCA plots for D mesons"};
   Configurable<bool> doDCAplots3Prong{"doDCAplots3Prong", true, "do daughter prong DCA plots for Lc baryons"};
   Configurable<bool> doTopoPlotsForSAndB{"doTopoPlotsForSAndB", true, "do topological variable distributions for S and B separately"};
diff --git a/ALICE3/TableProducer/alice3HfSelector3Prong.cxx b/ALICE3/TableProducer/alice3HfSelector3Prong.cxx
index 54dcb1feb49..1ab36779658 100644
--- a/ALICE3/TableProducer/alice3HfSelector3Prong.cxx
+++ b/ALICE3/TableProducer/alice3HfSelector3Prong.cxx
@@ -14,8 +14,6 @@
 ///
 /// \author Marcello Di Costanzo <marcello.di.costanzo@cern.ch>, Polytechnic University of Turin and INFN Turin
 
-#include "ALICE3/Utils/utilsHfAlice3.h"
-#include "ALICE3/Utils/utilsSelectionsAlice3.h"
 #include "PWGHF/Core/SelectorCuts.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
@@ -26,6 +24,8 @@
 #include "ALICE3/DataModel/OTFTOF.h"
 #include "ALICE3/DataModel/RICH.h"
 #include "ALICE3/ML/Alice3MlResponse3Prong.h"
+#include "ALICE3/Utils/utilsHfAlice3.h"
+#include "ALICE3/Utils/utilsSelectionsAlice3.h"
 #include "Common/Core/TrackSelectorPID.h"
 #include "Common/DataModel/PIDResponseCombined.h"
 
diff --git a/ALICE3/TableProducer/alice3HfTreeCreator3Prong.cxx b/ALICE3/TableProducer/alice3HfTreeCreator3Prong.cxx
index 6b6d2cccad8..b0467aba5c2 100644
--- a/ALICE3/TableProducer/alice3HfTreeCreator3Prong.cxx
+++ b/ALICE3/TableProducer/alice3HfTreeCreator3Prong.cxx
@@ -18,13 +18,13 @@
 #include "PWGHF/Core/DecayChannels.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
-#include "ALICE3/Utils/utilsHfAlice3.h"
 
 #include "ALICE3/DataModel/A3DecayFinderTables.h"
 #include "ALICE3/DataModel/OTFPIDTrk.h"
 #include "ALICE3/DataModel/OTFRICH.h"
 #include "ALICE3/DataModel/OTFTOF.h"
 #include "ALICE3/DataModel/RICH.h"
+#include "ALICE3/Utils/utilsHfAlice3.h"
 #include "Common/Core/RecoDecay.h"
 
 #include <CommonConstants/PhysicsConstants.h>
diff --git a/ALICE3/Tasks/alice3HfTask3Prong.cxx b/ALICE3/Tasks/alice3HfTask3Prong.cxx
index e02fe552a97..7c1e42cc4e1 100644
--- a/ALICE3/Tasks/alice3HfTask3Prong.cxx
+++ b/ALICE3/Tasks/alice3HfTask3Prong.cxx
@@ -14,8 +14,6 @@
 /// \author Marcello Di Costanzo <marcello.di.costanzo@cern.ch>, Polytechnic University of Turin and INFN Turin
 
 #include "PWGHF/Core/DecayChannels.h"
-#include "ALICE3/Utils/utilsHfAlice3.h"
-#include "ALICE3/Utils/utilsSelectionsAlice3.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
 
 #include "ALICE3/DataModel/A3DecayFinderTables.h"
@@ -23,6 +21,8 @@
 #include "ALICE3/DataModel/OTFRICH.h"
 #include "ALICE3/DataModel/OTFTOF.h"
 #include "ALICE3/DataModel/RICH.h"
+#include "ALICE3/Utils/utilsHfAlice3.h"
+#include "ALICE3/Utils/utilsSelectionsAlice3.h"
 #include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/EventSelection.h"
 
@@ -249,7 +249,6 @@ struct Alice3Task3Prong {
         const auto pt = candidate.pt();
         const auto originType = candidate.originMcRec();
 
-        
         if (fillThn) {
           if (candidate.isSelMassHypo0()) {
             registry.fill(HIST("hSelectionStatus"), 0., pt);
diff --git a/ALICE3/Utils/utilsHfAlice3.h b/ALICE3/Utils/utilsHfAlice3.h
index 91922eb7d32..69f1fc18371 100644
--- a/ALICE3/Utils/utilsHfAlice3.h
+++ b/ALICE3/Utils/utilsHfAlice3.h
@@ -17,8 +17,8 @@
 #ifndef PWGHF_CORE_HFHELPERALICE3_H_
 #define PWGHF_CORE_HFHELPERALICE3_H_
 
-#include "PWGHF/Utils/utilsAnalysis.h"
 #include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/Utils/utilsAnalysis.h"
 
 #include "Common/Core/RecoDecay.h"
 #include "Common/Core/TrackSelectorPID.h"