diff --git a/PWGUD/Core/SGTrackSelector.h b/PWGUD/Core/SGTrackSelector.h
index eb5c1385b3e..3e0bd3a1134 100644
--- a/PWGUD/Core/SGTrackSelector.h
+++ b/PWGUD/Core/SGTrackSelector.h
@@ -48,12 +48,12 @@ int trackselector(const T& track, const std::vector<float>& params)
     return 0;
   if (std::abs(track.dcaZ()) > params[1])
     return 0;
-  if (!params[2]){
-      if (std::abs(track.dcaXY()) > .0105 + .035 / pow(a.Pt(), 1.1))
-        return 0;
+  if (!params[2]) {
+    if (std::abs(track.dcaXY()) > .0105 + .035 / pow(a.Pt(), 1.1))
+      return 0;
   } else {
-      if (std::abs(track.dcaXY()) > params[2])
-         return 0;
+    if (std::abs(track.dcaXY()) > params[2])
+      return 0;
   }
   if (track.tpcChi2NCl() > params[3])
     return 0;
diff --git a/PWGUD/Tasks/sgD0Analyzer.cxx b/PWGUD/Tasks/sgD0Analyzer.cxx
index 1f2ff1df1c6..1890263f50b 100644
--- a/PWGUD/Tasks/sgD0Analyzer.cxx
+++ b/PWGUD/Tasks/sgD0Analyzer.cxx
@@ -39,7 +39,7 @@ struct SGD0Analyzer {
   Configurable<float> FDDA_cut{"FDDA", 10000., "FDDA threshold"};
   Configurable<float> FDDC_cut{"FDDC", 10000., "FDDC threshold"};
   Configurable<float> ZDC_cut{"ZDC", 10., "ZDC threshold"};
-  //Track Selections
+  // Track Selections
   Configurable<float> PV_cut{"PV_cut", 0.0, "Use Only PV tracks"};
   Configurable<float> dcaZ_cut{"dcaZ_cut", 2.0, "dcaZ cut"};
   Configurable<float> dcaXY_cut{"dcaXY_cut", 2.0, "dcaXY cut (0 for Pt-function)"};
@@ -47,7 +47,7 @@ struct SGD0Analyzer {
   Configurable<float> tpcNClsFindable_cut{"tpcNClsFindable_cut", 70, "Min tpcNClsFindable"};
   Configurable<float> itsChi2_cut{"itsChi2_cut", 36, "Max itsChi2NCl"};
   Configurable<float> eta_cut{"eta_cut", 0.9, "Track Pseudorapidity"};
-  //D0 Specific Cuts
+  // D0 Specific Cuts
   Configurable<float> Ntr_min{"Ntr_min", 2., "Minimum Number of Tracks"};
   Configurable<float> Ntr_max{"Ntr_max", 50., "Maximum Number of Tracks"};
   HistogramRegistry registry{
@@ -80,9 +80,9 @@ struct SGD0Analyzer {
       {"ss_KPi_pT_2", "K#pi pT (GeV/c); Entries", {HistType::kTH1F, {{5000, 0, 10}}}},
       {"ss_KPi_eTa_2", "K#pi eTa (GeV/c); Entries", {HistType::kTH1F, {{100, -1., 1.}}}},
       {"ss_KPi_invm_2", "K#pi Mass (GeV/c^2); Entries", {HistType::kTH1F, {{5000, 0, 10}}}},
-      {"os_Ntr_KPi_invm_0", "N tracks vs K#pi Mass", {HistType::kTH2F, {{48, 1.5, 49.5},{750, .7, 2.2}}}},
-      {"os_Ntr_KPi_invm_1", "N tracks vs K#pi Mass", {HistType::kTH2F, {{48, 1.5, 49.5},{750, .7, 2.2}}}},
-      {"os_Ntr_KPi_invm_2", "N tracks vs K#pi Mass", {HistType::kTH2F, {{48, 1.5, 49.5},{750, .7, 2.2}}}},
+      {"os_Ntr_KPi_invm_0", "N tracks vs K#pi Mass", {HistType::kTH2F, {{48, 1.5, 49.5}, {750, .7, 2.2}}}},
+      {"os_Ntr_KPi_invm_1", "N tracks vs K#pi Mass", {HistType::kTH2F, {{48, 1.5, 49.5}, {750, .7, 2.2}}}},
+      {"os_Ntr_KPi_invm_2", "N tracks vs K#pi Mass", {HistType::kTH2F, {{48, 1.5, 49.5}, {750, .7, 2.2}}}},
       {"D0_FT0A", "FIT Amplitude", {HistType::kTH1F, {{500, 0, 1000}}}},
       {"D0_FT0C", "FIT Amplitude", {HistType::kTH1F, {{500, 0, 1000}}}},
       {"D0_FV0A", "FIT Amplitude", {HistType::kTH1F, {{500, 0, 1000}}}},
@@ -95,8 +95,7 @@ struct SGD0Analyzer {
       {"D0_Ntr_2", "Tracks", {HistType::kTH1F, {{100, 0.5, 100.5}}}},
       {"D0_NtrPV_0", "Tracks", {HistType::kTH1F, {{50, 0.5, 50.5}}}},
       {"D0_NtrPV_1", "Tracks", {HistType::kTH1F, {{50, 0.5, 50.5}}}},
-      {"D0_NtrPV_2", "Tracks", {HistType::kTH1F, {{50, 0.5, 50.5}}}}
-    }};
+      {"D0_NtrPV_2", "Tracks", {HistType::kTH1F, {{50, 0.5, 50.5}}}}}};
   using udtracks = soa::Join<aod::UDTracks, aod::UDTracksExtra, aod::UDTracksPID>;
   using udtracksfull = soa::Join<aod::UDTracks, aod::UDTracksPID, aod::UDTracksExtra, aod::UDTracksFlags, aod::UDTracksDCA>;
   using UDCollisionsFull = soa::Join<aod::UDCollisions, aod::SGCollisions, aod::UDCollisionsSels, aod::UDZdcsReduced>; //
@@ -121,15 +120,18 @@ struct SGD0Analyzer {
     registry.fill(HIST("GapSide"), gapSide);
     registry.fill(HIST("TrueGapSide"), truegapSide);
     gapSide = truegapSide;
-    int pvtracks=0;
+    int pvtracks = 0;
     for (auto& t0 : tracks) {
-	    if (trackselector(t0, parameters) && t0.isPVContributor())pvtracks++;
+      if (trackselector(t0, parameters) && t0.isPVContributor())
+        pvtracks++;
     }
     // Look for D0 and D0bar
-    if (tracks.size() < Ntr_min || tracks.size() > Ntr_max) return;
+    if (tracks.size() < Ntr_min || tracks.size() > Ntr_max)
+      return;
     for (auto& [t0, t1] : combinations(tracks, tracks)) {
       // PID cut - t0=K, t1=pi
-      if (!trackselector(t0, parameters)||!trackselector(t1,parameters))continue;
+      if (!trackselector(t0, parameters) || !trackselector(t1, parameters))
+        continue;
       if (std::abs(t0.tpcNSigmaKa()) < 3 && std::abs(t1.tpcNSigmaPi()) < 3 && std::abs(t0.tofNSigmaKa()) < 3 && std::abs(t1.tofNSigmaPi()) < 3) {
         // Apply pion hypothesis and create pairs
         v0.SetXYZM(t0.px(), t0.py(), t0.pz(), o2::constants::physics::MassKaonCharged);
@@ -145,37 +147,37 @@ struct SGD0Analyzer {
             registry.fill(HIST("os_KPi_eTa_0"), v01.Eta());
             registry.fill(HIST("os_KPi_invm_0"), v01.M());
             registry.fill(HIST("os_Ntr_KPi_invm_0"), tracks.size(), v01.M());
-	    if (v01.M() > 1.8 && v01.M() < 1.9){
-               registry.fill(HIST("D0_Ntr_0"), tracks.size());
-               registry.fill(HIST("D0_NtrPV_0"), pvtracks);
-	    }
+            if (v01.M() > 1.8 && v01.M() < 1.9) {
+              registry.fill(HIST("D0_Ntr_0"), tracks.size());
+              registry.fill(HIST("D0_NtrPV_0"), pvtracks);
+            }
           }
           if (gapSide == 1) {
             registry.fill(HIST("os_KPi_pT_1"), v01.Pt());
             registry.fill(HIST("os_KPi_eTa_1"), v01.Eta());
             registry.fill(HIST("os_KPi_invm_1"), v01.M());
             registry.fill(HIST("os_Ntr_KPi_invm_1"), tracks.size(), v01.M());
-	    if (v01.M() > 1.8 && v01.M() < 1.9){
-               registry.fill(HIST("D0_Ntr_1"), tracks.size());
-               registry.fill(HIST("D0_NtrPV_1"), pvtracks);
-	    }
+            if (v01.M() > 1.8 && v01.M() < 1.9) {
+              registry.fill(HIST("D0_Ntr_1"), tracks.size());
+              registry.fill(HIST("D0_NtrPV_1"), pvtracks);
+            }
           }
           if (gapSide == 2) {
             registry.fill(HIST("os_KPi_pT_2"), v01.Pt());
             registry.fill(HIST("os_KPi_eTa_2"), v01.Eta());
             registry.fill(HIST("os_KPi_invm_2"), v01.M());
             registry.fill(HIST("os_Ntr_KPi_invm_2"), tracks.size(), v01.M());
-	    if (v01.M() > 1.8 && v01.M() < 1.9){
-               registry.fill(HIST("D0_Ntr_2"), tracks.size());
-               registry.fill(HIST("D0_NtrPV_2"), pvtracks);
-               registry.fill(HIST("D0_FT0A"), collision.totalFT0AmplitudeA());
-               registry.fill(HIST("D0_FT0C"), collision.totalFT0AmplitudeC());
-               registry.fill(HIST("D0_FV0A"), collision.totalFV0AmplitudeA());
-               registry.fill(HIST("D0_FDDA"), collision.totalFDDAmplitudeA());
-               registry.fill(HIST("D0_FDDC"), collision.totalFDDAmplitudeC());
-               registry.fill(HIST("D0_ZNA"), collision.energyCommonZNA());
-               registry.fill(HIST("D0_ZNC"), collision.energyCommonZNC());
-	    }
+            if (v01.M() > 1.8 && v01.M() < 1.9) {
+              registry.fill(HIST("D0_Ntr_2"), tracks.size());
+              registry.fill(HIST("D0_NtrPV_2"), pvtracks);
+              registry.fill(HIST("D0_FT0A"), collision.totalFT0AmplitudeA());
+              registry.fill(HIST("D0_FT0C"), collision.totalFT0AmplitudeC());
+              registry.fill(HIST("D0_FV0A"), collision.totalFV0AmplitudeA());
+              registry.fill(HIST("D0_FDDA"), collision.totalFDDAmplitudeA());
+              registry.fill(HIST("D0_FDDC"), collision.totalFDDAmplitudeC());
+              registry.fill(HIST("D0_ZNA"), collision.energyCommonZNA());
+              registry.fill(HIST("D0_ZNC"), collision.energyCommonZNC());
+            }
           }
         } else if (t0.sign() == t1.sign()) {
           registry.fill(HIST("ss_KPi_pT"), v01.Pt());
@@ -212,37 +214,37 @@ struct SGD0Analyzer {
             registry.fill(HIST("os_KPi_eTa_0"), v01.Eta());
             registry.fill(HIST("os_KPi_invm_0"), v01.M());
             registry.fill(HIST("os_Ntr_KPi_invm_0"), tracks.size(), v01.M());
-	    if (v01.M() > 1.8 && v01.M() < 1.9){
-               registry.fill(HIST("D0_Ntr_0"), tracks.size());
-               registry.fill(HIST("D0_NtrPV_0"), pvtracks);
-	    }
+            if (v01.M() > 1.8 && v01.M() < 1.9) {
+              registry.fill(HIST("D0_Ntr_0"), tracks.size());
+              registry.fill(HIST("D0_NtrPV_0"), pvtracks);
+            }
           }
           if (gapSide == 1) {
             registry.fill(HIST("os_KPi_pT_1"), v01.Pt());
             registry.fill(HIST("os_KPi_eTa_1"), v01.Eta());
             registry.fill(HIST("os_KPi_invm_1"), v01.M());
             registry.fill(HIST("os_Ntr_KPi_invm_1"), tracks.size(), v01.M());
-	    if (v01.M() > 1.8 && v01.M() < 1.9){
-               registry.fill(HIST("D0_Ntr_1"), tracks.size());
-               registry.fill(HIST("D0_NtrPV_1"), pvtracks);
-	    }
+            if (v01.M() > 1.8 && v01.M() < 1.9) {
+              registry.fill(HIST("D0_Ntr_1"), tracks.size());
+              registry.fill(HIST("D0_NtrPV_1"), pvtracks);
+            }
           }
           if (gapSide == 2) {
             registry.fill(HIST("os_KPi_pT_2"), v01.Pt());
             registry.fill(HIST("os_KPi_eTa_2"), v01.Eta());
             registry.fill(HIST("os_KPi_invm_2"), v01.M());
             registry.fill(HIST("os_Ntr_KPi_invm_2"), tracks.size(), v01.M());
-	    if (v01.M() > 1.8 && v01.M() < 1.9){
-               registry.fill(HIST("D0_Ntr_2"), tracks.size());
-               registry.fill(HIST("D0_NtrPV_2"), pvtracks);
-               registry.fill(HIST("D0_FT0A"), collision.totalFT0AmplitudeA());
-               registry.fill(HIST("D0_FT0C"), collision.totalFT0AmplitudeC());
-               registry.fill(HIST("D0_FV0A"), collision.totalFV0AmplitudeA());
-               registry.fill(HIST("D0_FDDA"), collision.totalFDDAmplitudeA());
-               registry.fill(HIST("D0_FDDC"), collision.totalFDDAmplitudeC());
-               registry.fill(HIST("D0_ZNA"), collision.energyCommonZNA());
-               registry.fill(HIST("D0_ZNC"), collision.energyCommonZNC());
-	    }
+            if (v01.M() > 1.8 && v01.M() < 1.9) {
+              registry.fill(HIST("D0_Ntr_2"), tracks.size());
+              registry.fill(HIST("D0_NtrPV_2"), pvtracks);
+              registry.fill(HIST("D0_FT0A"), collision.totalFT0AmplitudeA());
+              registry.fill(HIST("D0_FT0C"), collision.totalFT0AmplitudeC());
+              registry.fill(HIST("D0_FV0A"), collision.totalFV0AmplitudeA());
+              registry.fill(HIST("D0_FDDA"), collision.totalFDDAmplitudeA());
+              registry.fill(HIST("D0_FDDC"), collision.totalFDDAmplitudeC());
+              registry.fill(HIST("D0_ZNA"), collision.energyCommonZNA());
+              registry.fill(HIST("D0_ZNC"), collision.energyCommonZNC());
+            }
           }
         } else if (t0.sign() == t1.sign()) {
           registry.fill(HIST("ss_KPi_pT"), v01.Pt());
diff --git a/PWGUD/Tasks/sgFITAnalyzer.cxx b/PWGUD/Tasks/sgFITAnalyzer.cxx
index c32688d8b0c..19c01d136de 100644
--- a/PWGUD/Tasks/sgFITAnalyzer.cxx
+++ b/PWGUD/Tasks/sgFITAnalyzer.cxx
@@ -49,7 +49,7 @@ struct SGFITAnalyzer { // UDTutorial01
   Configurable<float> FT0C_cut{"FT0C", 50., "FT0C threshold"};
   Configurable<float> FDDA_cut{"FDDA", 10000., "FDDA threshold"};
   Configurable<float> FDDC_cut{"FDDC", 10000., "FDDC threshold"};
-  //Track Selections
+  // Track Selections
   Configurable<float> PV_cut{"PV_cut", 1.0, "Use Only PV tracks"};
   Configurable<float> dcaZ_cut{"dcaZ_cut", 2.0, "dcaZ cut"};
   Configurable<float> dcaXY_cut{"dcaXY_cut", 0.0, "dcaXY cut (0 for Pt-function)"};
@@ -326,7 +326,7 @@ struct SGFITAnalyzer { // UDTutorial01
   using UDCollisionsFull = soa::Join<aod::UDCollisions, aod::SGCollisions, aod::UDCollisionsSels, aod::UDZdcsReduced>; // UDCollisions
   // using UDCollisionsFull = soa::Join<aod::UDCollisions, aod::SGCollisions>; // UDCollisions
   using UDCollisionFull = UDCollisionsFull::iterator;
-  //using UDTracksFull = soa::Join<aod::UDTracks, aod::UDTracksPID, aod::UDTracksExtra, aod::UDTracksFlags>;
+  // using UDTracksFull = soa::Join<aod::UDTracks, aod::UDTracksPID, aod::UDTracksExtra, aod::UDTracksFlags>;
   using UDTracksFull = soa::Join<aod::UDTracks, aod::UDTracksPID, aod::UDTracksExtra, aod::UDTracksFlags, aod::UDTracksDCA>;
   //  using UDTracksFull = soa::Join<aod::UDTracks, aod::UDTracksExtra, aod::UDTracksFlags>;
 
@@ -346,8 +346,8 @@ struct SGFITAnalyzer { // UDTutorial01
     // select PV contributors
     Partition<UDTracksFull> PVContributors = aod::udtrack::isPVContributor == true;
     PVContributors.bindTable(dgtracks);
-//    if (PVContributors.size() > 50)
- //     return;
+    //    if (PVContributors.size() > 50)
+    //     return;
     registry.get<TH1>(HIST("collisions/multiplicityPVC"))->Fill(PVContributors.size(), 1.);
     bool tof = false;
     // relative BC number
@@ -375,19 +375,22 @@ struct SGFITAnalyzer { // UDTutorial01
       if (trackselector(t, parameters)) {
         sign += t.sign();
         goodTracks.push_back(a);
-        if (std::abs(t.tpcNSigmaMu()) < 3) muonTracks.push_back(b);
+        if (std::abs(t.tpcNSigmaMu()) < 3)
+          muonTracks.push_back(b);
       }
     }
     if (goodTracks.size() == 2) {
       for (auto pion : goodTracks) {
         rho += pion;
       }
-      if (sign == 0 && TMath::Abs(rho.Rapidity()) < .9 && rho.M() > .5 && rho.M() < 1.2 && rho.Pt() < 0.1) coh_rho0 = true;
+      if (sign == 0 && TMath::Abs(rho.Rapidity()) < .9 && rho.M() > .5 && rho.M() < 1.2 && rho.Pt() < 0.1)
+        coh_rho0 = true;
       if (muonTracks.size() == 2) {
         for (auto muon : muonTracks) {
           jpsi += muon;
         }
-        if (sign == 0 && TMath::Abs(jpsi.Rapidity()) < .9 && jpsi.M() > 2.8 && jpsi.M() < 3.35 && jpsi.Pt() < 0.1) coh_jpsi = true;
+        if (sign == 0 && TMath::Abs(jpsi.Rapidity()) < .9 && jpsi.M() > 2.8 && jpsi.M() < 3.35 && jpsi.Pt() < 0.1)
+          coh_jpsi = true;
       }
     }
     int pva = 0;
diff --git a/PWGUD/Tasks/sgFourPiAnalyzer.cxx b/PWGUD/Tasks/sgFourPiAnalyzer.cxx
index 7ff0538ea3d..4275976824b 100644
--- a/PWGUD/Tasks/sgFourPiAnalyzer.cxx
+++ b/PWGUD/Tasks/sgFourPiAnalyzer.cxx
@@ -39,14 +39,14 @@ using namespace o2::framework::expressions;
 #define mproton 0.9383
 struct SGFourPiAnalyzer {
   SGSelector sgSelector;
-  //Adjusted Gap thresholds
+  // Adjusted Gap thresholds
   Configurable<float> FV0_cut{"FV0", 50., "FV0A threshold"};
   Configurable<float> FT0A_cut{"FT0A", 150., "FT0A threshold"};
   Configurable<float> FT0C_cut{"FT0C", 50., "FT0C threshold"};
   Configurable<float> FDDA_cut{"FDDA", 10000., "FDDA threshold"};
   Configurable<float> FDDC_cut{"FDDC", 10000., "FDDC threshold"};
   Configurable<float> ZDC_cut{"ZDC", 10., "ZDC threshold"};
-  //Track Selections
+  // Track Selections
   Configurable<float> PV_cut{"PV_cut", 1.0, "Use Only PV tracks"};
   Configurable<float> dcaZ_cut{"dcaZ_cut", 2.0, "dcaZ cut"};
   Configurable<float> dcaXY_cut{"dcaXY_cut", 0.0, "dcaXY cut (0 for Pt-function)"};
diff --git a/PWGUD/Tasks/sgSpectraAnalyzer.cxx b/PWGUD/Tasks/sgSpectraAnalyzer.cxx
index db79f5945d3..7be510e4e61 100644
--- a/PWGUD/Tasks/sgSpectraAnalyzer.cxx
+++ b/PWGUD/Tasks/sgSpectraAnalyzer.cxx
@@ -41,7 +41,7 @@ struct SGSpectraAnalyzer {
   Configurable<float> FDDC_cut{"FDDC", 10000., "FDDC threshold"};
   Configurable<float> ZDC_cut{"ZDC", 10., "ZDC threshold"};
   Configurable<bool> use_tof{"Use_TOF", true, "TOF PID"};
-  //Track Selections
+  // Track Selections
   Configurable<float> PV_cut{"PV_cut", 1.0, "Use Only PV tracks"};
   Configurable<float> dcaZ_cut{"dcaZ_cut", 2.0, "dcaZ cut"};
   Configurable<float> dcaXY_cut{"dcaXY_cut", 0.0, "dcaXY cut (0 for Pt-function)"};
diff --git a/PWGUD/Tasks/sgTwoPiAnalyzer.cxx b/PWGUD/Tasks/sgTwoPiAnalyzer.cxx
index b093044c348..dbaaa4227d6 100644
--- a/PWGUD/Tasks/sgTwoPiAnalyzer.cxx
+++ b/PWGUD/Tasks/sgTwoPiAnalyzer.cxx
@@ -45,7 +45,7 @@ struct SGTwoPiAnalyzer {
   Configurable<float> FDDA_cut{"FDDA", 10000., "FDDA threshold"};
   Configurable<float> FDDC_cut{"FDDC", 10000., "FDDC threshold"};
   Configurable<float> ZDC_cut{"ZDC", 10., "ZDC threshold"};
-  //Track Selections
+  // Track Selections
   Configurable<float> PV_cut{"PV_cut", 1.0, "Use Only PV tracks"};
   Configurable<float> dcaZ_cut{"dcaZ_cut", 2.0, "dcaZ cut"};
   Configurable<float> dcaXY_cut{"dcaXY_cut", 0.0, "dcaXY cut (0 for Pt-function)"};