diff --git a/PWGJE/DataModel/GammaJetAnalysisTree.h b/PWGJE/DataModel/GammaJetAnalysisTree.h
index a33da476e5a..7d468a339e7 100644
--- a/PWGJE/DataModel/GammaJetAnalysisTree.h
+++ b/PWGJE/DataModel/GammaJetAnalysisTree.h
@@ -74,7 +74,7 @@ DECLARE_SOA_COLUMN(LeadingTrackPt, leadingtrackpt, float);
 DECLARE_SOA_COLUMN(PerpConeRho, perpconerho, float);
 DECLARE_SOA_COLUMN(NConstituents, nConstituents, ushort);
 } // namespace gjchjet
-DECLARE_SOA_TABLE(GjChargedJets, "AOD", "GJCHJET", gjchjet::GjEventId, gjchjet::Pt, gjchjet::Eta, gjchjet::Phi, gjchjet::Radius, gjchjet::Energy, gjchjet::Mass, gjchjet::Area, gjchjet::LeadingTrackPt,gjchjet::PerpConeRho,gjchjet::NConstituents)
+DECLARE_SOA_TABLE(GjChargedJets, "AOD", "GJCHJET", gjchjet::GjEventId, gjchjet::Pt, gjchjet::Eta, gjchjet::Phi, gjchjet::Radius, gjchjet::Energy, gjchjet::Mass, gjchjet::Area, gjchjet::LeadingTrackPt, gjchjet::PerpConeRho, gjchjet::NConstituents)
 } // namespace o2::aod
 
 #endif // PWGJE_DATAMODEL_GAMMAJETANALYSISTREE_H_
diff --git a/PWGJE/TableProducer/emcalCorrectionTask.cxx b/PWGJE/TableProducer/emcalCorrectionTask.cxx
index 76f92ed69e2..e14c347eb37 100644
--- a/PWGJE/TableProducer/emcalCorrectionTask.cxx
+++ b/PWGJE/TableProducer/emcalCorrectionTask.cxx
@@ -568,7 +568,7 @@ struct EmcalCorrectionTask {
     mClusterLabels.clear();
     mClusterFactories.reset();
     // in preparation for future O2 changes
-    //mClusterFactories.setClusterizerSettings(mClusterDefinitions.at(iClusterizer).minCellEnergy, mClusterDefinitions.at(iClusterizer).timeMin, mClusterDefinitions.at(iClusterizer).timeMax, mClusterDefinitions.at(iClusterizer).recalcShowerShape5x5);
+    // mClusterFactories.setClusterizerSettings(mClusterDefinitions.at(iClusterizer).minCellEnergy, mClusterDefinitions.at(iClusterizer).timeMin, mClusterDefinitions.at(iClusterizer).timeMax, mClusterDefinitions.at(iClusterizer).recalcShowerShape5x5);
     if (cellLabels) {
       mClusterFactories.setContainer(*emcalClusters, cellsBC, *emcalClustersInputIndices, cellLabels);
     } else {
diff --git a/PWGJE/Tasks/gammaJetTreeProducer.cxx b/PWGJE/Tasks/gammaJetTreeProducer.cxx
index e7f4b3c3574..e1ffd83887f 100644
--- a/PWGJE/Tasks/gammaJetTreeProducer.cxx
+++ b/PWGJE/Tasks/gammaJetTreeProducer.cxx
@@ -107,7 +107,7 @@ struct GammaJetTreeProducer {
     const o2Axis energyAxis{100, 0, 100, "E (GeV)"};
     const o2Axis m02Axis{100, 0, 3, "m02"};
     const o2Axis etaAxis{100, -1, 1, "#eta"};
-    const o2Axis phiAxis{100, 0 , 2*TMath::Pi(), "#phi"};
+    const o2Axis phiAxis{100, 0, 2 * TMath::Pi(), "#phi"};
     const o2Axis occupancyAxis{300, 0, 30000, "occupancy"};
     mHistograms.add("clusterE", "Energy of cluster", o2HistType::kTH1F, {energyAxis});
     mHistograms.add("trackPt", "pT of track", o2HistType::kTH1F, {ptAxis});
@@ -264,7 +264,8 @@ struct GammaJetTreeProducer {
   {
     // event selection
     int32_t storedColIndex = getStoredColIndex(collision);
-    if (storedColIndex == -1) return;
+    if (storedColIndex == -1)
+      return;
 
     // eventsTable(collision.multiplicity(), collision.centrality(), collision.rho(), collision.eventSel(), collision.trackOccupancyInTimeRange(), collision.alias_raw());
     // collisionMapping[collision.globalIndex()] = eventsTable.lastIndex();
@@ -296,7 +297,7 @@ struct GammaJetTreeProducer {
         auto emcTracksPerTrack = emctracks.sliceBy(EMCTrackPerTrack, track.globalIndex());
         auto emcTrack = emcTracksPerTrack.iteratorAt(0);
         // find closest track that still has E/p < trackMatchingEoverP
-        if (cluster.energy()/track.p() > trackMatchingEoverP) {
+        if (cluster.energy() / track.p() > trackMatchingEoverP) {
           continue;
         } else {
           dEta = cluster.eta() - emcTrack.etaEmcal();
@@ -321,7 +322,8 @@ struct GammaJetTreeProducer {
   {
     // event selection
     int32_t storedColIndex = getStoredColIndex(collision);
-    if (storedColIndex == -1) return;
+    if (storedColIndex == -1)
+      return;
     float leadingTrackPt = 0;
     ushort nconst = 0;
     // loop over charged jets