diff --git a/Common/LegacyDataQA/otfv0qa.cxx b/Common/LegacyDataQA/otfv0qa.cxx
index 0d66c82c78c..3bfe8c87831 100644
--- a/Common/LegacyDataQA/otfv0qa.cxx
+++ b/Common/LegacyDataQA/otfv0qa.cxx
@@ -49,11 +49,11 @@ struct OTFV0Qa {
     histos.fill(HIST("hCandidates"), v0s.size());
     for (auto const& v0 : v0s) {
       histos.fill(HIST("hGammaMass"), v0.mass());
-      if(v0.mass()<maxGammaMassForXYplot){
       if (v0.mass() < maxGammaMassForXYplot) {
-        histos.fill(HIST("h2dPosition"), v0.x(), v0.y());
+        if (v0.mass() < maxGammaMassForXYplot) {
+          histos.fill(HIST("h2dPosition"), v0.x(), v0.y());
+        }
       }
-    }
   }
 };
 
diff --git a/Common/LegacyDataQA/tpcpidqa.cxx b/Common/LegacyDataQA/tpcpidqa.cxx
index 19d16904e51..c4d9fa4e1f0 100644
--- a/Common/LegacyDataQA/tpcpidqa.cxx
+++ b/Common/LegacyDataQA/tpcpidqa.cxx
@@ -9,13 +9,13 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
-// This task converts tiny PID tables into full PID tables. 
-// It is meant to be used with Run 2 converted data to maintain 
-// full compatibility with any task that may subscribe to the Full 
-// tables (at the cost of some memory consumption). 
-// It is also able to produce very simple QA plots on the stored 
-// quantities (optionally disabled for simplicity) 
-// 
+// This task converts tiny PID tables into full PID tables.
+// It is meant to be used with Run 2 converted data to maintain
+// full compatibility with any task that may subscribe to the Full
+// tables (at the cost of some memory consumption).
+// It is also able to produce very simple QA plots on the stored
+// quantities (optionally disabled for simplicity)
+//
 // Warning: expected resolution is NOT provided.
 
 #include "Framework/runDataProcessing.h"
@@ -81,33 +81,33 @@ struct TpcPidQa {
   void process(tinyPidTracks const& tracks)
   {
     for (const auto& track : tracks) {
-      if(mEnabledTables[kPidEl]){
-        histos.fill(HIST("hNSigmaVsPTotEl"), track.p(), track.tpcNSigmaEl());  
+      if (mEnabledTables[kPidEl]) {
+        histos.fill(HIST("hNSigmaVsPTotEl"), track.p(), track.tpcNSigmaEl());
+      }
+      if (mEnabledTables[kPidMu]) {
+        histos.fill(HIST("hNSigmaVsPTotMu"), track.p(), track.tpcNSigmaMu());
+      }
+      if (mEnabledTables[kPidPi]) {
+        histos.fill(HIST("hNSigmaVsPTotPi"), track.p(), track.tpcNSigmaPi());
+      }
+      if (mEnabledTables[kPidKa]) {
+        histos.fill(HIST("hNSigmaVsPTotKa"), track.p(), track.tpcNSigmaKa());
       }
-      if(mEnabledTables[kPidMu]){
-        histos.fill(HIST("hNSigmaVsPTotMu"), track.p(), track.tpcNSigmaMu());  
+      if (mEnabledTables[kPidPr]) {
+        histos.fill(HIST("hNSigmaVsPTotPr"), track.p(), track.tpcNSigmaPr());
       }
-      if(mEnabledTables[kPidPi]){
-        histos.fill(HIST("hNSigmaVsPTotPi"), track.p(), track.tpcNSigmaPi());  
+      if (mEnabledTables[kPidDe]) {
+        histos.fill(HIST("hNSigmaVsPTotDe"), track.p(), track.tpcNSigmaDe());
       }
-      if(mEnabledTables[kPidKa]){
-        histos.fill(HIST("hNSigmaVsPTotKa"), track.p(), track.tpcNSigmaKa());  
+      if (mEnabledTables[kPidTr]) {
+        histos.fill(HIST("hNSigmaVsPTotTr"), track.p(), track.tpcNSigmaTr());
       }
-      if(mEnabledTables[kPidPr]){
-        histos.fill(HIST("hNSigmaVsPTotPr"), track.p(), track.tpcNSigmaPr());  
+      if (mEnabledTables[kPidHe]) {
+        histos.fill(HIST("hNSigmaVsPTotHe"), track.p(), track.tpcNSigmaHe());
       }
-      if(mEnabledTables[kPidDe]){
-        histos.fill(HIST("hNSigmaVsPTotDe"), track.p(), track.tpcNSigmaDe());  
+      if (mEnabledTables[kPidAl]) {
+        histos.fill(HIST("hNSigmaVsPTotAl"), track.p(), track.tpcNSigmaAl());
       }
-      if(mEnabledTables[kPidTr]){
-        histos.fill(HIST("hNSigmaVsPTotTr"), track.p(), track.tpcNSigmaTr());  
-      }    
-      if(mEnabledTables[kPidHe]){
-        histos.fill(HIST("hNSigmaVsPTotHe"), track.p(), track.tpcNSigmaHe());  
-      }    
-      if(mEnabledTables[kPidAl]){
-        histos.fill(HIST("hNSigmaVsPTotAl"), track.p(), track.tpcNSigmaAl());  
-      }    
     }
   }
 };
diff --git a/Common/TableProducer/Converters/run2TinyToFullPID.cxx b/Common/TableProducer/Converters/run2TinyToFullPID.cxx
index 6ac32847c38..6ab17c85a52 100644
--- a/Common/TableProducer/Converters/run2TinyToFullPID.cxx
+++ b/Common/TableProducer/Converters/run2TinyToFullPID.cxx
@@ -9,13 +9,13 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 //
-// This task converts tiny PID tables into full PID tables. 
-// It is meant to be used with Run 2 converted data to maintain 
-// full compatibility with any task that may subscribe to the Full 
-// tables (at the cost of some memory consumption). 
-// It is also able to produce very simple QA plots on the stored 
-// quantities (optionally disabled for simplicity) 
-// 
+// This task converts tiny PID tables into full PID tables.
+// It is meant to be used with Run 2 converted data to maintain
+// full compatibility with any task that may subscribe to the Full
+// tables (at the cost of some memory consumption).
+// It is also able to produce very simple QA plots on the stored
+// quantities (optionally disabled for simplicity)
+//
 // Warning: expected resolution is NOT provided.
 
 #include "Framework/runDataProcessing.h"
@@ -109,10 +109,10 @@ struct Run2TinyToFullPID {
           break;
         case kPidHe:
           pidTPCFullHe.reserve(tracks.size());
-          break;  
+          break;
         case kPidAl:
           pidTPCFullAl.reserve(tracks.size());
-          break;  
+          break;
         default:
           LOG(fatal) << "Unknown table requested: " << i;
           break;
@@ -145,10 +145,10 @@ struct Run2TinyToFullPID {
             break;
           case kPidHe:
             pidTPCFullHe(0.0f, track.tpcNSigmaHe());
-            break;  
+            break;
           case kPidAl:
             pidTPCFullAl(0.0f, track.tpcNSigmaAl());
-            break;  
+            break;
           default:
             LOG(fatal) << "Unknown table requested: " << i;
             break;
diff --git a/Common/TableProducer/multiplicityTable.cxx b/Common/TableProducer/multiplicityTable.cxx
index 4d80c3cb36d..6d4411f7058 100644
--- a/Common/TableProducer/multiplicityTable.cxx
+++ b/Common/TableProducer/multiplicityTable.cxx
@@ -134,7 +134,7 @@ struct MultiplicityTable {
   TProfile* hVtxZFT0A;
   TProfile* hVtxZFT0C;
   TProfile* hVtxZFDDA;
-  
+
   TProfile* hVtxZFDDC;
   TProfile* hVtxZNTracks;
   std::vector<int> mEnabledTables; // Vector of enabled tables
@@ -166,10 +166,10 @@ struct MultiplicityTable {
     auto& workflows = context.services().get<o2::framework::RunningWorkflowInfo const>();
     for (auto const& device : workflows.devices) {
       for (auto const& input : device.inputs) {
-        //input.print();
-        TString devNam = device.name.c_str(); 
-        TString inBin = input.matcher.binding.c_str(); 
-        //TString subSpec = input.matcher.subspec.c_str(); 
+        // input.print();
+        TString devNam = device.name.c_str();
+        TString inBin = input.matcher.binding.c_str();
+        // TString subSpec = input.matcher.subspec.c_str();
         LOGF(info, Form("device %s input binding %s subspec", devNam.Data(), inBin.Data()));
       }
     }