diff --git a/PWGLF/DataModel/LFHStrangeCorrelationTables.h b/PWGLF/DataModel/LFHStrangeCorrelationTables.h
index 5fa841c58f9..62de2bbd2d0 100644
--- a/PWGLF/DataModel/LFHStrangeCorrelationTables.h
+++ b/PWGLF/DataModel/LFHStrangeCorrelationTables.h
@@ -41,9 +41,9 @@ DECLARE_SOA_TABLE(TriggerTracks, "AOD", "TRIGGERTRACKS", o2::soa::Index<>, trigg
 /// Table for storing assoc track indices
 namespace assocPions
 {
-DECLARE_SOA_INDEX_COLUMN(Collision, collision);                       //!
+DECLARE_SOA_INDEX_COLUMN(Collision, collision);                     //!
 DECLARE_SOA_INDEX_COLUMN_FULL(Track, track, int, Tracks, "_Assoc"); //!
-} // namespace triggerTracks
+} // namespace assocPions
 DECLARE_SOA_TABLE(AssocPions, "AOD", "ASSOCPIONS", o2::soa::Index<>, assocPions::CollisionId, assocPions::TrackId);
 /// _________________________________________
 /// Table for storing associated V0 indices
diff --git a/PWGLF/TableProducer/hStrangeCorrelationFilter.cxx b/PWGLF/TableProducer/hStrangeCorrelationFilter.cxx
index ee071a6b839..37541cbd8e9 100644
--- a/PWGLF/TableProducer/hStrangeCorrelationFilter.cxx
+++ b/PWGLF/TableProducer/hStrangeCorrelationFilter.cxx
@@ -203,34 +203,39 @@ struct hstrangecorrelationfilter {
       if (!track.hasITS() && triggerRequireITS) {
         continue; // skip, doesn't have ITS signal (skips lots of TPC-only!)
       }
-      //prepared for Bayesian PID
-        // if (!track.bayesPi() > pionMinBayesProb) {
-        //   continue;
-        // }
-        // if (track.bayesPi() < track.bayesPr() || track.bayesPi() < track.bayesKa()){
-        //   continue;
-        // }
-        // if (track.tpcNSigmaPi() < assocPionNSigmaTPCFOF){
-        //   continue;
-        // }
-        // if (track.tofSignal() > 0 && track.tofNSigmaPi() < assocPionNSigmaTPCFOF){
-        //   continue;
-        // }
-      if (track.tofSignal() > 0){
-        if(std::sqrt(track.tofNSigmaPi()*track.tofNSigmaPi()+track.tpcNSigmaPi()*track.tpcNSigmaPi()) > assocPionNSigmaTPCFOF)
+      // prepared for Bayesian PID
+      //  if (!track.bayesPi() > pionMinBayesProb) {
+      //    continue;
+      //  }
+      //  if (track.bayesPi() < track.bayesPr() || track.bayesPi() < track.bayesKa()){
+      //    continue;
+      //  }
+      //  if (track.tpcNSigmaPi() < assocPionNSigmaTPCFOF){
+      //    continue;
+      //  }
+      //  if (track.tofSignal() > 0 && track.tofNSigmaPi() < assocPionNSigmaTPCFOF){
+      //    continue;
+      //  }
+      if (track.tofSignal() > 0) {
+        if (std::sqrt(track.tofNSigmaPi() * track.tofNSigmaPi() + track.tpcNSigmaPi() * track.tpcNSigmaPi()) > assocPionNSigmaTPCFOF)
           continue;
-        if (track.tofNSigmaPr() < rejectSigma) continue;
-        if (track.tpcNSigmaPr() < rejectSigma) continue;
-        if (track.tofNSigmaKa() < rejectSigma) continue;
-        if (track.tpcNSigmaKa() < rejectSigma) continue;
-      }else{
-        if(track.tpcNSigmaPi() > assocPionNSigmaTPCFOF)
+        if (track.tofNSigmaPr() < rejectSigma)
+          continue;
+        if (track.tpcNSigmaPr() < rejectSigma)
+          continue;
+        if (track.tofNSigmaKa() < rejectSigma)
+          continue;
+        if (track.tpcNSigmaKa() < rejectSigma)
+          continue;
+      } else {
+        if (track.tpcNSigmaPi() > assocPionNSigmaTPCFOF)
+          continue;
+        if (track.tpcNSigmaPr() < rejectSigma)
+          continue;
+        if (track.tpcNSigmaKa() < rejectSigma)
           continue;
-        if (track.tpcNSigmaPr() < rejectSigma) continue;
-        if (track.tpcNSigmaKa() < rejectSigma) continue;
       }
 
-
       assocPion(
         track.collisionId(),
         track.globalIndex());
diff --git a/PWGLF/Tasks/hStrangeCorrelation.cxx b/PWGLF/Tasks/hStrangeCorrelation.cxx
index fd5a23d0475..9dcd6c4320a 100644
--- a/PWGLF/Tasks/hStrangeCorrelation.cxx
+++ b/PWGLF/Tasks/hStrangeCorrelation.cxx
@@ -157,7 +157,7 @@ struct correlateStrangeness {
         float deltaphi = ComputeDeltaPhi(trigg.phi(), assoc.phi());
         float deltaeta = trigg.eta() - assoc.eta();
         float ptassoc = assoc.pt();
-        if(!mixing)
+        if (!mixing)
           histos.fill(HIST("sameEvent/Pion"), deltaphi, deltaeta, ptassoc, pvz, mult);
         else
           histos.fill(HIST("mixedEvent/Pion"), deltaphi, deltaeta, ptassoc, pvz, mult);
@@ -255,7 +255,7 @@ struct correlateStrangeness {
     if (doCorrelationPion)
       histos.add("sameEvent/Pion", "Pion", kTHnF, {axisDeltaPhi, axisDeltaEta, axisPtAssoc, ConfVtxBins, ConfMultBins});
 
-    if(doCorrelationK0Short || doCorrelationLambda || doCorrelationAntiLambda || doCorrelationXiMinus || doCorrelationXiPlus || doCorrelationOmegaMinus || doCorrelationOmegaPlus) {
+    if (doCorrelationK0Short || doCorrelationLambda || doCorrelationAntiLambda || doCorrelationXiMinus || doCorrelationXiPlus || doCorrelationOmegaMinus || doCorrelationOmegaPlus) {
       histos.addClone("sameEvent/Signal/", "sameEvent/LeftBg/");
       histos.addClone("sameEvent/Signal/", "sameEvent/RightBg/");
     }
@@ -369,8 +369,8 @@ struct correlateStrangeness {
     fillCorrelationsCascade(triggerTracks, associatedCascades, false, collision.posZ(), collision.centFT0M());
   }
   void processSameEventHPions(soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Ms>::iterator const& collision,
-                            aod::AssocPions const& associatedPions, aod::TriggerTracks const& triggerTracks,
-                            TracksComplete const&)
+                              aod::AssocPions const& associatedPions, aod::TriggerTracks const& triggerTracks,
+                              TracksComplete const&)
   {
     // ________________________________________________
     // Perform basic event selection
@@ -381,7 +381,7 @@ struct correlateStrangeness {
       return;
     }
     // ________________________________________________
-    if (!doprocessSameEventHCascades && ! doprocessSameEventHV0s) {
+    if (!doprocessSameEventHCascades && !doprocessSameEventHV0s) {
       histos.fill(HIST("MixingQA/hSECollisionBins"), colBinning.getBin({collision.posZ(), collision.centFT0M()}));
       histos.fill(HIST("EventQA/hMult"), collision.centFT0M());
       histos.fill(HIST("EventQA/hPvz"), collision.posZ());
@@ -391,7 +391,7 @@ struct correlateStrangeness {
       auto pionTrack = pion.track_as<TracksComplete>();
       histos.fill(HIST("hPionEtaVsPtVsPhi"), pionTrack.pt(), pionTrack.eta(), pionTrack.phi());
     }
-    if (!doprocessSameEventHCascades && ! doprocessSameEventHV0s) {
+    if (!doprocessSameEventHCascades && !doprocessSameEventHV0s) {
       for (auto const& triggerTrack : triggerTracks) {
         auto track = triggerTrack.track_as<TracksComplete>();
         histos.fill(HIST("hTrackEtaVsPtVsPhi"), track.pt(), track.eta(), track.phi());
@@ -455,8 +455,8 @@ struct correlateStrangeness {
     }
   }
   void processMixedEventHPions(soa::Join<aod::Collisions, aod::EvSels, aod::CentFT0Ms> const& collisions,
-                                  aod::AssocPions const& assocPions, aod::TriggerTracks const& triggerTracks,
-                                  TracksComplete const&)
+                               aod::AssocPions const& assocPions, aod::TriggerTracks const& triggerTracks,
+                               TracksComplete const&)
   {
     for (auto& [collision1, collision2] : soa::selfCombinations(colBinning, 5, -1, collisions, collisions)) {
       // ________________________________________________