diff --git a/PWGLF/Tasks/Nuspex/hadronnucleicorrelation.cxx b/PWGLF/Tasks/Nuspex/hadronnucleicorrelation.cxx
index 9cbf49aeaaa..38f1ff6949c 100644
--- a/PWGLF/Tasks/Nuspex/hadronnucleicorrelation.cxx
+++ b/PWGLF/Tasks/Nuspex/hadronnucleicorrelation.cxx
@@ -17,11 +17,18 @@
 #include "PWGCF/Femto3D/DataModel/singletrackselector.h"
 
 #include "Common/Core/RecoDecay.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "CCDB/BasicCCDBManager.h"
 #include "CCDB/CcdbApi.h"
+#include "CommonConstants/PhysicsConstants.h"
 #include "Framework/ASoA.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/DataTypes.h"
@@ -29,19 +36,9 @@
 #include "Framework/HistogramRegistry.h"
 #include "Framework/O2DatabasePDGPlugin.h"
 #include "Framework/StaticFor.h"
+#include "Framework/StepTHn.h"
 #include "Framework/runDataProcessing.h"
 #include "MathUtils/Utils.h"
-
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-
-#include "CommonConstants/PhysicsConstants.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/StepTHn.h"
 #include "ReconstructionDataFormats/Track.h"
 
 #include "TGrid.h"
@@ -138,8 +135,8 @@ struct hadronnucleicorrelation {
 
   using trkType = const FilteredTracks::iterator*;
   using trkTypeMC = const FilteredTracksMC::iterator*;
-  //typedef std::shared_ptr<FilteredCollisions::iterator> colType;
-  //typedef std::shared_ptr<SimCollisions::iterator> MCcolType;
+  // typedef std::shared_ptr<FilteredCollisions::iterator> colType;
+  // typedef std::shared_ptr<SimCollisions::iterator> MCcolType;
 
   std::unique_ptr<o2::aod::singletrackselector::FemtoPair<trkType>> Pair = std::make_unique<o2::aod::singletrackselector::FemtoPair<trkType>>();
   std::unique_ptr<o2::aod::singletrackselector::FemtoPair<trkTypeMC>> PairMC = std::make_unique<o2::aod::singletrackselector::FemtoPair<trkTypeMC>>();
@@ -638,7 +635,6 @@ struct hadronnucleicorrelation {
     } // nBinspT loop
   }
 
-
   void GetCorrection(o2::framework::Service<o2::ccdb::BasicCCDBManager> const& ccdbObj, TString filepath, TString histname)
   {
     TList* l = ccdbObj->get<TList>(filepath.Data());
@@ -676,7 +672,7 @@ struct hadronnucleicorrelation {
   {
 
     if (std::abs(collision.posZ()) > cutzvertex)
-        return;
+      return;
 
     registry.fill(HIST("hNEvents"), 0.5);
     registry.fill(HIST("hMult"), collision.mult());
@@ -717,28 +713,28 @@ struct hadronnucleicorrelation {
         QA.fill(HIST("QA/hnSigmaITSVsPt_Pr"), track.pt() * track.sign(), track.itsNSigmaPr());
         QA.fill(HIST("QA/hnSigmaITSVsPt_De"), track.pt() * track.sign(), track.itsNSigmaDe());
 
-        if (IsProton(track, +1)){
+        if (IsProton(track, +1)) {
           QA.fill(HIST("QA/hEtaAntiPr"), track.eta());
           QA.fill(HIST("QA/hPhiAntiPr"), track.phi());
           QA.fill(HIST("QA/hnSigmaTOFVsPt_Pr_AfterSel"), track.pt() * track.sign(), track.tofNSigmaPr());
           QA.fill(HIST("QA/hnSigmaTPCVsPt_Pr_AfterSel"), track.pt() * track.sign(), track.tpcNSigmaPr());
           QA.fill(HIST("QA/hnSigmaITSVsPt_Pr_AfterSel"), track.pt() * track.sign(), track.itsNSigmaPr());
         }
-        if (IsProton(track, -1)){
+        if (IsProton(track, -1)) {
           QA.fill(HIST("QA/hEtaPr"), track.eta());
           QA.fill(HIST("QA/hPhiPr"), track.phi());
           QA.fill(HIST("QA/hnSigmaTOFVsPt_Pr_AfterSel"), track.pt() * track.sign(), track.tofNSigmaPr());
           QA.fill(HIST("QA/hnSigmaTPCVsPt_Pr_AfterSel"), track.pt() * track.sign(), track.tpcNSigmaPr());
           QA.fill(HIST("QA/hnSigmaITSVsPt_Pr_AfterSel"), track.pt() * track.sign(), track.itsNSigmaPr());
         }
-        if (IsDeuteron(track, +1)){
+        if (IsDeuteron(track, +1)) {
           QA.fill(HIST("QA/hEtaAntiDe"), track.eta());
           QA.fill(HIST("QA/hPhiAntiDe"), track.phi());
           QA.fill(HIST("QA/hnSigmaTOFVsPt_De_AfterSel"), track.pt() * track.sign(), track.tofNSigmaDe());
           QA.fill(HIST("QA/hnSigmaTPCVsPt_De_AfterSel"), track.pt() * track.sign(), track.tpcNSigmaDe());
           QA.fill(HIST("QA/hnSigmaITSVsPt_De_AfterSel"), track.pt() * track.sign(), track.itsNSigmaDe());
         }
-        if (IsDeuteron(track, -1)){
+        if (IsDeuteron(track, -1)) {
           QA.fill(HIST("QA/hEtaDe"), track.eta());
           QA.fill(HIST("QA/hPhiDe"), track.phi());
           QA.fill(HIST("QA/hnSigmaTOFVsPt_De_AfterSel"), track.pt() * track.sign(), track.tofNSigmaDe());
@@ -748,7 +744,7 @@ struct hadronnucleicorrelation {
       }
     }
 
-    if (mode == 5 || mode == 6) { //Identical particle combinations
+    if (mode == 5 || mode == 6) { // Identical particle combinations
 
       for (const auto& [part0, part1] : combinations(CombinationsStrictlyUpperIndexPolicy(tracks, tracks))) {
 
@@ -766,15 +762,15 @@ struct hadronnucleicorrelation {
         if (!applyDCAcut(part1))
           continue;
 
-        //mode 6
-        if (mode == 6){
+        // mode 6
+        if (mode == 6) {
           if (!IsProton(part0, +1))
             continue;
           if (!IsProton(part1, +1))
             continue;
         }
-        //mode 5
-        if (mode == 5){
+        // mode 5
+        if (mode == 5) {
           if (!IsProton(part0, -1))
             continue;
           if (!IsProton(part1, -1))
@@ -802,7 +798,7 @@ struct hadronnucleicorrelation {
         if (!applyDCAcut(part1))
           continue;
 
-        //modes 0,1,2,3,4,7
+        // modes 0,1,2,3,4,7
         if (mode == 0) {
           if (!IsDeuteron(part0, -1))
             continue;
@@ -846,13 +842,12 @@ struct hadronnucleicorrelation {
   }
   PROCESS_SWITCH(hadronnucleicorrelation, processSameEvent, "processSameEvent", true);
 
-
   void processMixedEvent(FilteredCollisions const& collisions, FilteredTracks const& tracks)
   {
 
     for (const auto& [collision1, collision2] : soa::selfCombinations(colBinning, 5, -1, collisions, collisions)) {
 
-      //LOGF(info, "Mixed event collisions: (%d, %d) zvtx (%.1f, %.1f) mult (%d, %d)", collision1.globalIndex(), collision2.globalIndex(), collision1.posZ(), collision2.posZ(), collision1.mult(), collision2.mult());
+      // LOGF(info, "Mixed event collisions: (%d, %d) zvtx (%.1f, %.1f) mult (%d, %d)", collision1.globalIndex(), collision2.globalIndex(), collision1.posZ(), collision2.posZ(), collision1.mult(), collision2.mult());
 
       auto groupPartsOne = tracks.sliceByCached(o2::aod::singletrackselector::singleCollSelId, collision1.globalIndex(), cache);
       auto groupPartsTwo = tracks.sliceByCached(o2::aod::singletrackselector::singleCollSelId, collision2.globalIndex(), cache);
@@ -911,19 +906,19 @@ struct hadronnucleicorrelation {
           if (!IsProton(part1, +1))
             continue;
         }
-        if (mode == 5){
+        if (mode == 5) {
           if (!IsProton(part0, -1))
             continue;
           if (!IsProton(part1, -1))
             continue;
         }
-        if (mode == 6){
+        if (mode == 6) {
           if (!IsProton(part0, +1))
             continue;
           if (!IsProton(part1, +1))
             continue;
         }
-        if (mode == 7){
+        if (mode == 7) {
           if (!IsProton(part0, +1))
             continue;
           if (!IsProton(part1, -1))
@@ -1310,7 +1305,7 @@ struct hadronnucleicorrelation {
   {
 
     if (std::abs(mcCollision.posZ()) > cutzvertex)
-        return;
+      return;
 
     registry.fill(HIST("Generated/hNEventsMC"), 0.5);
 
@@ -1364,19 +1359,19 @@ struct hadronnucleicorrelation {
       }
     }
 
-    if (mode == 5 || mode == 6) { //Identical particle combinations
+    if (mode == 5 || mode == 6) { // Identical particle combinations
 
       for (const auto& [part0, part1] : combinations(CombinationsStrictlyUpperIndexPolicy(mcParticles, mcParticles))) {
 
-        //mode 6
-        if (mode == 6){
+        // mode 6
+        if (mode == 6) {
           if (part0.pdgCode() != PDG_t::kProton)
             continue;
           if (part1.pdgCode() != PDG_t::kProton)
             continue;
         }
-        //mode 5
-        if (mode == 5){
+        // mode 5
+        if (mode == 5) {
           if (part0.pdgCode() != -PDG_t::kProton)
             continue;
           if (part1.pdgCode() != -PDG_t::kProton)
@@ -1438,7 +1433,7 @@ struct hadronnucleicorrelation {
 
     for (const auto& [collision1, collision2] : soa::selfCombinations(colBinningGen, 5, -1, mcCollisions, mcCollisions)) {
 
-      //LOGF(info, "Mixed event collisions: (%d, %d) zvtx (%.1f, %.1f) mult (%d, %d)", collision1.globalIndex(), collision2.globalIndex(), collision1.posZ(), collision2.posZ(), collision1.mult(), collision2.mult());
+      // LOGF(info, "Mixed event collisions: (%d, %d) zvtx (%.1f, %.1f) mult (%d, %d)", collision1.globalIndex(), collision2.globalIndex(), collision1.posZ(), collision2.posZ(), collision1.mult(), collision2.mult());
 
       auto groupPartsOne = mcParticles.sliceByCached(o2::aod::mcparticle::mcCollisionId, collision1.globalIndex(), cache);
       auto groupPartsTwo = mcParticles.sliceByCached(o2::aod::mcparticle::mcCollisionId, collision2.globalIndex(), cache);
@@ -1475,13 +1470,13 @@ struct hadronnucleicorrelation {
           if (part1.pdgCode() != PDG_t::kProton)
             continue;
         }
-        if (mode == 5){
+        if (mode == 5) {
           if (part0.pdgCode() != -PDG_t::kProton)
             continue;
           if (part1.pdgCode() != -PDG_t::kProton)
             continue;
         }
-        if (mode == 6){
+        if (mode == 6) {
           if (part0.pdgCode() != PDG_t::kProton)
             continue;
           if (part1.pdgCode() != PDG_t::kProton)