diff --git a/core/base/CbmDaq.cxx b/core/base/CbmDaq.cxx
index 7369824bddef4820d8db8bb7eb9a4bf756de0f97..710b27dd45630c1ad081e8fcd6bb5b3b18a90405 100644
--- a/core/base/CbmDaq.cxx
+++ b/core/base/CbmDaq.cxx
@@ -512,8 +512,7 @@ void CbmDaq::StartNextTimeSlice()
 void CbmDaq::SetLatency(Double_t time)
 {
   if (time > fLatency) {
-    LOG(info) << "The latency was set from " << fLatency
-              << "ns to " << time << "ns";
+    LOG(info) << "The latency was set from " << fLatency << "ns to " << time << "ns";
     fLatency = time;
   }
 }
diff --git a/macro/PWG/common/production/run_reco_json_config.C b/macro/PWG/common/production/run_reco_json_config.C
index c3ae710c2493ad23d17d6c2664a442d5804fbb25..d8fe9c8c52d2088ee92548ff5ff51f4b508a62b7 100644
--- a/macro/PWG/common/production/run_reco_json_config.C
+++ b/macro/PWG/common/production/run_reco_json_config.C
@@ -41,6 +41,7 @@
 #include "CbmTofSimpClusterizer.h"
 #include "CbmTrdClusterFinder.h"
 #include "CbmTrdHitProducer.h"
+#include "rootalias.C"
 
 #include <FairFileSource.h>
 #include <FairMonitor.h>
@@ -51,8 +52,6 @@
 #include <FairSystemInfo.h>
 
 #include <TStopwatch.h>
-
-#include "rootalias.C"
 #endif
 
 
@@ -209,7 +208,9 @@ void run_reco_json_config(TString input = "", Int_t nTimeSlices = -1, Int_t firs
   // -----   FairRunAna   ---------------------------------------------------
   FairRunAna* run             = new FairRunAna();
   FairFileSource* inputSource = new FairFileSource(rawFile);
-  if (isL1Matching) { inputSource->AddFriend(traFile); }
+  if (isL1Matching) {
+    inputSource->AddFriend(traFile);
+  }
   run->SetSource(inputSource);
   run->SetSink(std::make_unique<FairRootFileSink>(outFile));
   run->SetGenerateRunInfo(kTRUE);
@@ -309,7 +310,7 @@ void run_reco_json_config(TString input = "", Int_t nTimeSlices = -1, Int_t firs
       }
       run->AddTask(mvdCluster);
       std::cout << "-I- : Added task " << mvdCluster->GetName() << std::endl;
- 
+
       CbmMvdHitfinder* mvdHit = new CbmMvdHitfinder("MVD Hit Finder", 0, 0);
       mvdHit->UseClusterfinder(kTRUE);
       if (eventBased) {
@@ -369,7 +370,8 @@ void run_reco_json_config(TString input = "", Int_t nTimeSlices = -1, Int_t firs
 
     Double_t triggerThreshold       = 0.5e-6;  // SIS100
     CbmTrdClusterFinder* trdCluster = new CbmTrdClusterFinder();
-    if (eventBased) trdCluster->SetTimeBased(kFALSE);
+    if (eventBased)
+      trdCluster->SetTimeBased(kFALSE);
     else
       trdCluster->SetTimeBased(kTRUE);
     trdCluster->SetNeighbourEnable(true, false);
diff --git a/macro/mvd/qa/mvd_qa4_reco.C b/macro/mvd/qa/mvd_qa4_reco.C
index 991d9cec762a6778459a5dde4d62cb05cabee1ab..ecbeed01c33bfe4d11ee3326232b748562e43774 100644
--- a/macro/mvd/qa/mvd_qa4_reco.C
+++ b/macro/mvd/qa/mvd_qa4_reco.C
@@ -76,7 +76,9 @@ void mvd_qa4_reco(const char* setup = "sis100_electron")
 
   fRun->SetOutputFile(outFile);
   Bool_t hasFairMonitor = Has_Fair_Monitor();
-  if (hasFairMonitor) { FairMonitor::GetMonitor()->EnableMonitor(kTRUE); }
+  if (hasFairMonitor) {
+    FairMonitor::GetMonitor()->EnableMonitor(kTRUE);
+  }
   // ------------------------------------------------------------------------
 
   // ----- Mc Data Manager   ------------------------------------------------
diff --git a/macro/run/run_reco.C b/macro/run/run_reco.C
index 32c8ed41d62340cbbbcf4c84412498ab132999c2..3a36dce69057f7fcd1e634001bc6a3288e992a52 100644
--- a/macro/run/run_reco.C
+++ b/macro/run/run_reco.C
@@ -44,6 +44,7 @@
 #include "CbmTrdClusterFinder.h"
 #include "CbmTrdHitProducer.h"
 #include "CbmTrdSetTracksPidLike.h"
+#include "rootalias.C"
 
 #include <FairFileSource.h>
 #include <FairMonitor.h>
@@ -56,8 +57,6 @@
 #include <TObjString.h>
 #include <TROOT.h>
 #include <TStopwatch.h>
-
-#include "rootalias.C"
 #endif
 
 
@@ -189,7 +188,9 @@ void run_reco(TString input = "", Int_t nTimeSlices = -1, Int_t firstTimeSlice =
   // -----   FairRunAna   ---------------------------------------------------
   FairRunAna* run             = new FairRunAna();
   FairFileSource* inputSource = new FairFileSource(rawFile);
-  if (debugWithMC) { inputSource->AddFriend(traFile); }
+  if (debugWithMC) {
+    inputSource->AddFriend(traFile);
+  }
   run->SetSource(inputSource);
   run->SetOutputFile(outFile);
   run->SetGenerateRunInfo(kTRUE);
@@ -279,7 +280,9 @@ void run_reco(TString input = "", Int_t nTimeSlices = -1, Int_t firstTimeSlice =
   if (useMvd) {
     if (!(sEvBuildRaw.EqualTo("Real", TString::ECaseCompare::kIgnoreCase))) {
       CbmMvdClusterfinder* mvdCluster = new CbmMvdClusterfinder("MVD Cluster Finder", 0, 0);
-      if (eventBased) { mvdCluster->SetMode(ECbmRecoMode::EventByEvent); }
+      if (eventBased) {
+        mvdCluster->SetMode(ECbmRecoMode::EventByEvent);
+      }
       else {
         mvdCluster->SetMode(ECbmRecoMode::Timeslice);
       }
@@ -289,7 +292,9 @@ void run_reco(TString input = "", Int_t nTimeSlices = -1, Int_t firstTimeSlice =
 
       CbmMvdHitfinder* mvdHit = new CbmMvdHitfinder("MVD Hit Finder", 0, 0);
       mvdHit->UseClusterfinder(kTRUE);
-      if (eventBased) { mvdHit->SetMode(ECbmRecoMode::EventByEvent); }
+      if (eventBased) {
+        mvdHit->SetMode(ECbmRecoMode::EventByEvent);
+      }
       else {
         mvdHit->SetMode(ECbmRecoMode::Timeslice);
       }
@@ -333,7 +338,9 @@ void run_reco(TString input = "", Int_t nTimeSlices = -1, Int_t firstTimeSlice =
 
     // --- Initialization of the digi scheme
     auto muchGeoScheme = CbmMuchGeoScheme::Instance();
-    if (!muchGeoScheme->IsInitialized()) { muchGeoScheme->Init(parFile, muchFlag); }
+    if (!muchGeoScheme->IsInitialized()) {
+      muchGeoScheme->Init(parFile, muchFlag);
+    }
 
     // --- Hit finder for GEMs
     FairTask* muchReco = new CbmMuchFindHitsGem(parFile.Data(), muchFlag);
@@ -349,7 +356,8 @@ void run_reco(TString input = "", Int_t nTimeSlices = -1, Int_t firstTimeSlice =
 
     Double_t triggerThreshold       = 0.5e-6;  // SIS100
     CbmTrdClusterFinder* trdCluster = new CbmTrdClusterFinder();
-    if (eventBased) trdCluster->SetTimeBased(kFALSE);
+    if (eventBased)
+      trdCluster->SetTimeBased(kFALSE);
     else
       trdCluster->SetTimeBased(kTRUE);
     trdCluster->SetNeighbourEnable(true, false);
diff --git a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.cxx b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.cxx
index d82832f56fbb37047eb40c97140873cf474fa0e8..1a982c4a5c5f2858c353f8c892ab70f584d605ac 100644
--- a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.cxx
+++ b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.cxx
@@ -9,11 +9,11 @@
 
 #include "CbmMvdSensorClusterfinderTask.h"
 
-#include <Logger.h>
-
 #include "TClonesArray.h"
 #include "TObjArray.h"
 
+#include <Logger.h>
+
 using std::endl;
 using std::pair;
 using std::vector;
@@ -227,32 +227,38 @@ void CbmMvdSensorClusterfinderTask::Exec()
           "CbmMvdSensorClusterfinderTask::Exec - fInputBuffer missing");
   }
 
-  if (fInputBuffer->GetEntriesFast() == 0) { return; }
+  if (fInputBuffer->GetEntriesFast() == 0) {
+    return;
+  }
 
-  CbmMvdDigi* digi     = (CbmMvdDigi*) fInputBuffer->At(0);
-  Int_t minFrame = digi->GetFrameNumber();
-  Int_t maxFrame = digi->GetFrameNumber();
+  CbmMvdDigi* digi = (CbmMvdDigi*) fInputBuffer->At(0);
+  Int_t minFrame   = digi->GetFrameNumber();
+  Int_t maxFrame   = digi->GetFrameNumber();
 
 
   for (Int_t i = 0; i < fInputBuffer->GetEntriesFast(); i++) {
 
     digi = (CbmMvdDigi*) fInputBuffer->At(i);
-    if (digi->GetFrameNumber() > maxFrame) { maxFrame = digi->GetFrameNumber(); };
-    if (digi->GetFrameNumber() < minFrame) { minFrame = digi->GetFrameNumber(); };
+    if (digi->GetFrameNumber() > maxFrame) {
+      maxFrame = digi->GetFrameNumber();
+    };
+    if (digi->GetFrameNumber() < minFrame) {
+      minFrame = digi->GetFrameNumber();
+    };
   }
 
 
   //Fill frameBuffer for the first frame of interest
 
-  for (Int_t i = fInputBuffer->GetEntriesFast()-1; i >= 0; --i) {
+  for (Int_t i = fInputBuffer->GetEntriesFast() - 1; i >= 0; --i) {
     digi = (CbmMvdDigi*) fInputBuffer->At(i);
-    if (digi->GetFrameNumber() == minFrame) { 
-      fInputFrameBuffer->AbsorbObjects(fInputBuffer, i, i); 
+    if (digi->GetFrameNumber() == minFrame) {
+      fInputFrameBuffer->AbsorbObjects(fInputBuffer, i, i);
     }
   }
 
   delete fPixelUsed;
-  fPixelUsed=nullptr;
+  fPixelUsed = nullptr;
 
   // Continue filling starting from the 2nd frame. Two frames are processed by ExecFrame in order to avoid handle time walk
   // Work on all frames of the input. Independent of running in time or event based
@@ -261,18 +267,20 @@ void CbmMvdSensorClusterfinderTask::Exec()
   // time slices are independent of each other all data needs to be written
   // to the output
   Int_t currentFrame{minFrame};
-  for (currentFrame = minFrame; currentFrame < maxFrame +1 ; currentFrame++) {
+  for (currentFrame = minFrame; currentFrame < maxFrame + 1; currentFrame++) {
 
     LOG(debug) << "CbmMvdSensorClusterfinderTask::Exec() - Running frame " << currentFrame;
 
-     CleanBuffers(currentFrame);
-     delete fPixelUsed;
+    CleanBuffers(currentFrame);
+    delete fPixelUsed;
 
     // Add data from the next frame. Note: This is the second of two valid frames.
 
-    for (Int_t i = fInputBuffer->GetEntriesFast()-1; i >= 0; --i) {
+    for (Int_t i = fInputBuffer->GetEntriesFast() - 1; i >= 0; --i) {
       digi = (CbmMvdDigi*) fInputBuffer->At(i);
-      if (digi->GetFrameNumber() == currentFrame + 1) { fInputFrameBuffer->AbsorbObjects(fInputBuffer, i, i); }
+      if (digi->GetFrameNumber() == currentFrame + 1) {
+        fInputFrameBuffer->AbsorbObjects(fInputBuffer, i, i);
+      }
     }
 
     fPixelUsed = new TArrayS(fInputFrameBuffer->GetEntriesFast());
@@ -288,8 +296,7 @@ void CbmMvdSensorClusterfinderTask::Exec()
     fOutputFrameBuffer->Clear();
   }
 
- CleanBuffers(currentFrame);
-
+  CleanBuffers(currentFrame);
 }
 
 void CbmMvdSensorClusterfinderTask::CleanBuffers(Int_t currentFrame)
@@ -300,7 +307,9 @@ void CbmMvdSensorClusterfinderTask::CleanBuffers(Int_t currentFrame)
   // Clean up input buffer from possible digis, which were already associated to a cluster while processing the previous frame
   if (fPixelUsed) {
     for (Int_t i = fPixelUsed->GetSize() - 1; i >= 0; i--) {
-      if (fPixelUsed->At(i)) { fInputFrameBuffer->RemoveAt(i); }
+      if (fPixelUsed->At(i)) {
+        fInputFrameBuffer->RemoveAt(i);
+      }
     }
   }
 
@@ -311,9 +320,9 @@ void CbmMvdSensorClusterfinderTask::CleanBuffers(Int_t currentFrame)
 
   fInputFrameBuffer->Compress();
 
-  for (Int_t i = fInputFrameBuffer->GetEntriesFast()-1; i >= 0; --i) {
+  for (Int_t i = fInputFrameBuffer->GetEntriesFast() - 1; i >= 0; --i) {
     digi = (CbmMvdDigi*) fInputFrameBuffer->At(i);
-    if (digi->GetFrameNumber() < currentFrame - 1) { 
+    if (digi->GetFrameNumber() < currentFrame - 1) {
       LOG(error) << "We should never see this message";
       fInputFrameBuffer->RemoveAt(i);
     }
@@ -338,7 +347,9 @@ void CbmMvdSensorClusterfinderTask::ExecFrame(Int_t currentFrame)
     digi        = (CbmMvdDigi*) fInputFrameBuffer->At(iDigi);
 
 
-    if (!digi) { LOG(error) << "CbmMvdSensorFindHitTask - Fatal: No Digits found in this event."; }
+    if (!digi) {
+      LOG(error) << "CbmMvdSensorFindHitTask - Fatal: No Digits found in this event.";
+    }
 
     Int_t nDigis = fInputFrameBuffer->GetEntriesFast();
     //LOG(debug) << "CbmMvdClusterTrask::Exec(): Received following number of digis: " << nDigis;
@@ -355,11 +366,13 @@ void CbmMvdSensorClusterfinderTask::ExecFrame(Int_t currentFrame)
 
       digi  = (CbmMvdDigi*) fInputFrameBuffer->At(k);
       refId = digi->GetRefId();
-      if (refId < 0) { LOG(fatal) << "RefID of this digi is -1 this should not happend "; }
+      if (refId < 0) {
+        LOG(fatal) << "RefID of this digi is -1 this should not happend ";
+      }
       //apply fNeighThreshold
 
       if (GetAdcCharge(digi->GetCharge()) < fNeighThreshold) {
-/*
+        /*
         LOG(info) << "Digi Charge: " << digi->GetCharge();
         LOG(info) << "ADC Charge: " << GetAdcCharge(digi->GetCharge());
 */
@@ -401,7 +414,8 @@ void CbmMvdSensorClusterfinderTask::ExecFrame(Int_t currentFrame)
 
       LOG(debug) << "CbmMvdSensorClusterfinderTask: Checking for seed pixels...";
 
-      if ((GetAdcCharge(digi->GetCharge()) >= fSeedThreshold) && (fPixelUsed->At(iDigi) == kFALSE) && digi->GetFrameNumber()==currentFrame) {
+      if ((GetAdcCharge(digi->GetCharge()) >= fSeedThreshold) && (fPixelUsed->At(iDigi) == kFALSE)
+          && digi->GetFrameNumber() == currentFrame) {
         clusterArray->clear();
         clusterArray->push_back(iDigi);
 
@@ -411,7 +425,9 @@ void CbmMvdSensorClusterfinderTask::ExecFrame(Int_t currentFrame)
         fDigiMapIt = fDigiMap.find(a);
 
 
-        if (fDigiMapIt != fDigiMap.end()) { fDigiMap.erase(fDigiMapIt); };
+        if (fDigiMapIt != fDigiMap.end()) {
+          fDigiMap.erase(fDigiMapIt);
+        };
         // This triggers a re-sort of the map. Performance?
 
         for (ULong64_t iCluster = 0; iCluster < clusterArray->size(); iCluster++) {
@@ -467,7 +483,7 @@ void CbmMvdSensorClusterfinderTask::ExecFrame(Int_t currentFrame)
   }
   else {  //LOG(debug) << "No input found.";
   }
-//  fInputFrameBuffer->Clear();
+  //  fInputFrameBuffer->Clear();
 }
 // -------------------------------------------------------------------------
 
@@ -542,10 +558,14 @@ Int_t CbmMvdSensorClusterfinderTask::GetAdcCharge(Float_t charge)
 
   Int_t adcCharge;
 
-  if (charge < fAdcOffset) { return 0; };
+  if (charge < fAdcOffset) {
+    return 0;
+  };
 
   adcCharge = int((charge - fAdcOffset) / fAdcStepSize);
-  if (adcCharge > fAdcSteps - 1) { adcCharge = fAdcSteps - 1; }
+  if (adcCharge > fAdcSteps - 1) {
+    adcCharge = fAdcSteps - 1;
+  }
 
   return adcCharge;
 }
diff --git a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.h b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.h
index 357cf8a2cd5ea3c7491b1bb2e3ecbda2adabf23d..80bdc2bab6eed63b34161230492e8bf27c0ea378 100644
--- a/reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.h
+++ b/reco/detectors/mvd/plugins/tasks/CbmMvdSensorClusterfinderTask.h
@@ -16,7 +16,6 @@
 #include "CbmMvdDigi.h"
 #include "CbmMvdSensor.h"
 #include "CbmMvdSensorTask.h"
-
 #include "TArrayS.h"
 #include "TCanvas.h"
 #include "TH1.h"
@@ -28,6 +27,7 @@
 #include "TRefArray.h"
 #include "TStopwatch.h"
 #include "TString.h"
+
 #include <TClonesArray.h>
 
 #include <list>
@@ -40,7 +40,7 @@ class TRandom3;
 
 class CbmMvdSensorClusterfinderTask : public CbmMvdSensorTask {
 
-public:
+ public:
   /** Default constructor **/
   CbmMvdSensorClusterfinderTask();
 
@@ -100,7 +100,7 @@ public:
   void UpdateDebugHistos(CbmMvdCluster* cluster);
 
   //protected:
-protected:
+ protected:
   // ----------   Protected data members  ------------------------------------
 
   Int_t fAdcDynamic;
@@ -139,7 +139,7 @@ protected:
 
   TCanvas* c1;
 
-private:
+ private:
   Int_t fNEvent;
   Int_t fMode;
   Int_t fCounter;
@@ -190,7 +190,7 @@ private:
   Int_t GetMvdGeometry() { return 0; };
 
 
-private:
+ private:
   CbmMvdSensorClusterfinderTask(const CbmMvdSensorClusterfinderTask&);
   CbmMvdSensorClusterfinderTask operator=(const CbmMvdSensorClusterfinderTask&);
 
diff --git a/sim/detectors/mvd/CbmMvdDigitizer.cxx b/sim/detectors/mvd/CbmMvdDigitizer.cxx
index 5b40239c1809edb20281ee3671dd9a5da170e2b2..491e8a4d8c5672c0238f60422d56f83bd4e5ad1b 100644
--- a/sim/detectors/mvd/CbmMvdDigitizer.cxx
+++ b/sim/detectors/mvd/CbmMvdDigitizer.cxx
@@ -293,7 +293,9 @@ InitStatus CbmMvdDigitizer::Init()
   }
 
 
-  if (fEventMode) { LOG(info) << GetName() << ": Running in event mode"; }
+  if (fEventMode) {
+    LOG(info) << GetName() << ": Running in event mode";
+  }
   else {
     LOG(info) << GetName() << ": Running in time based mode";
   }
@@ -305,7 +307,9 @@ InitStatus CbmMvdDigitizer::Init()
   for (auto itr = sensorMap.begin(); itr != sensorMap.end(); itr++) {
     CbmMvdSensorDigitizerTask* digiTask = new CbmMvdSensorDigitizerTask();
     if (fNoiseSensors) digiTask->SetProduceNoise();
-    if (fEventMode) { digiTask->SetEventMode(); }
+    if (fEventMode) {
+      digiTask->SetEventMode();
+    }
     itr->second->AddPlugin(digiTask);
     itr->second->SetDigiPlugin(plugincount);
   }
@@ -382,7 +386,6 @@ void CbmMvdDigitizer::Finish()
     else {
       SendData(digi1->GetTime(), digi1);
     }
-
   }
 
   PrintParameters();
@@ -432,7 +435,9 @@ void CbmMvdDigitizer::DisplayDebugHistos()
     return;
   }
   for (Int_t i = 0; i < 9; i++) {
-    if (i >= fHistoArray->GetEntriesFast()) { continue; }
+    if (i >= fHistoArray->GetEntriesFast()) {
+      continue;
+    }
     LOG(debug) << "Trying to display histogram" << i;
     myChar               = 48 + (char) i;
     TString myCanvasName = "DigiCanvas" + myChar;
diff --git a/sim/detectors/mvd/CbmMvdDigitizer.h b/sim/detectors/mvd/CbmMvdDigitizer.h
index 898848812525e8cd372ecd4939481d6a699dd6dd..322888ce4a482a729309dca28fe5635170270082 100644
--- a/sim/detectors/mvd/CbmMvdDigitizer.h
+++ b/sim/detectors/mvd/CbmMvdDigitizer.h
@@ -37,7 +37,7 @@ class TMemberInspector;
 
 class CbmMvdDigitizer : public CbmDigitize<CbmMvdDigi> {
 
-public:
+ public:
   /** Default constructor **/
   CbmMvdDigitizer();
 
@@ -64,7 +64,7 @@ public:
    **/
   Double_t GetLatency() const { return fLatency; }
 
-  void SetLatency(Float_t latency) { fLatency = latency;}
+  void SetLatency(Float_t latency) { fLatency = latency; }
 
   void SetPileUp(Int_t pileUp) { fNPileup = pileUp; }
   void SetDeltaEvents(Int_t deltaEvents) { fNDeltaElect = deltaEvents; }
@@ -127,7 +127,7 @@ public:
   void PrintParameters() const;
   std::string ParametersToString() const;
 
-private:
+ private:
   /** Hit producer mode (0 = MAPS, 1 = Ideal) **/
   Int_t fMode;
 
@@ -166,16 +166,14 @@ private:
 
   TStopwatch fTimer;  ///< ROOT timer
 
-  Float_t    fLatency{150000.};  // maximum time of digi disordering
+  Float_t fLatency{150000.};  // maximum time of digi disordering
 
   /** Pileup manager **/
   CbmMvdPileupManager* fPileupManager;
   CbmMvdPileupManager* fDeltaManager;
 
 
-
-
-private:
+ private:
   CbmMvdDigitizer(const CbmMvdDigitizer&);
   CbmMvdDigitizer operator=(const CbmMvdDigitizer&);
 
diff --git a/sim/detectors/mvd/CbmMvdPixelCharge.cxx b/sim/detectors/mvd/CbmMvdPixelCharge.cxx
index 0896421353d0b13617db4717760ff52ccecad85f..1caede5e9ff5e350bbe366559099baa711142a56 100644
--- a/sim/detectors/mvd/CbmMvdPixelCharge.cxx
+++ b/sim/detectors/mvd/CbmMvdPixelCharge.cxx
@@ -10,7 +10,9 @@
 Bool_t CbmMvdPixelCharge::TestXY(Int_t channelNrX, Int_t channelNrY)
 {
 
-  if ((channelNrX == fChannelNrX) && (channelNrY == fChannelNrY)) { return 1; }
+  if ((channelNrX == fChannelNrX) && (channelNrY == fChannelNrY)) {
+    return 1;
+  }
   else {
     return 0;
   };
@@ -33,8 +35,7 @@ CbmMvdPixelCharge::CbmMvdPixelCharge(Float_t charge, Int_t channelNrX, Int_t cha
 // all segments of a track). Checks if a new track contributed charge to the pixel
 // Checks if the new track is dominant
 
-void CbmMvdPixelCharge::DigestCharge(Float_t pointX, Float_t pointY, Double_t time,
-                                     Int_t pointId, Int_t trackId,
+void CbmMvdPixelCharge::DigestCharge(Float_t pointX, Float_t pointY, Double_t time, Int_t pointId, Int_t trackId,
                                      Int_t inputNr, Int_t eventNr)
 {
   Float_t chargeContr = fTrackCharge;
diff --git a/sim/detectors/mvd/CbmMvdPixelCharge.h b/sim/detectors/mvd/CbmMvdPixelCharge.h
index 0d44f3cc39b75a4a0e29be3081b39df4b317f346..dff2f0ce31017149223fc19d4e58604703bda151 100644
--- a/sim/detectors/mvd/CbmMvdPixelCharge.h
+++ b/sim/detectors/mvd/CbmMvdPixelCharge.h
@@ -18,7 +18,7 @@ class TMemberInspector;
 
 class CbmMvdPixelCharge : public TObject {
 
-public:
+ public:
   /** Default constructor **/
   CbmMvdPixelCharge() = default;
 
@@ -30,8 +30,8 @@ public:
 
   Bool_t TestXY(Int_t channelNrX, Int_t channelNrY);
 
-  void DigestCharge(Float_t pointX, Float_t pointY, Double_t time, Int_t PointId,
-                    Int_t trackId, Int_t inputNr, Int_t eventNr);  // TODO: add time here
+  void DigestCharge(Float_t pointX, Float_t pointY, Double_t time, Int_t PointId, Int_t trackId, Int_t inputNr,
+                    Int_t eventNr);  // TODO: add time here
   void AddCharge(Float_t charge) { fTrackCharge = fTrackCharge + charge; };
 
 
@@ -53,7 +53,9 @@ public:
   std::vector<Float_t>& GetCharge() { return fCharge; };
   Float_t GetPixelTime()
   {
-    if (GetNContributors() != 0) { return fTime.front(); }
+    if (GetNContributors() != 0) {
+      return fTime.front();
+    }
     else {
       return -1.;
     };
@@ -61,14 +63,18 @@ public:
 
   Float_t GetEarliestHitTime()
   {
-    if (GetNContributors() != 0) { return fTime.front(); }
+    if (GetNContributors() != 0) {
+      return fTime.front();
+    }
     else {
       return -1.;
     }
   };
   Float_t GetLatestHitTime()
   {
-    if (GetNContributors() != 0) { return fTime.back(); }
+    if (GetNContributors() != 0) {
+      return fTime.back();
+    }
     else {
       return -1.;
     }
@@ -76,14 +82,18 @@ public:
 
   Float_t GetEarliestHitCharge()
   {
-    if (GetNContributors() != 0) { return fCharge.front(); }
+    if (GetNContributors() != 0) {
+      return fCharge.front();
+    }
     else {
       return -1.;
     }
   };
   Float_t GetLatestHitCharge()
   {
-    if (GetNContributors() != 0) { return fCharge.back(); }
+    if (GetNContributors() != 0) {
+      return fCharge.back();
+    }
     else {
       return -1.;
     }
@@ -94,11 +104,10 @@ public:
 
   void SetEndOfBusyTime(Double_t endOfBusyTime) { fEndOfBusyTime = endOfBusyTime; }
 
-  virtual void Clear(Option_t* = "") {};
-
+  virtual void Clear(Option_t* = ""){};
 
-private:
 
+ private:
   //Float_t fCharge = {-1.};
   Float_t fMaxChargeContribution = {0.};
   Float_t fDominatingPointX      = {-1.};
diff --git a/sim/detectors/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.cxx b/sim/detectors/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.cxx
index d98f05ee28b27694ca7bba3e1241189920a00a4c..dffb61dd31d30e08b28fbc3f7bf6a2a04e1d86fd 100644
--- a/sim/detectors/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.cxx
+++ b/sim/detectors/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.cxx
@@ -45,13 +45,12 @@
 #include <TRefArray.h>     // for TRefArray
 #include <TVector3.h>      // for TVector3, operator*, operator+
 
+#include <cmath>    // for sqrt
 #include <iomanip>  // for operator<<, setprecision, setw
 #include <map>      // for map, operator==, __map_iterator
 #include <ostream>  // for operator<<, basic_ostream, endl
 #include <vector>   // for allocator, vector
 
-#include <cmath>  // for sqrt
-
 
 using std::endl;
 using std::ios_base;
@@ -345,7 +344,9 @@ InitStatus CbmMvdSensorDigitizerTask::ReadSensorInformation()
 
   CbmMvdSensorDataSheet* sensorData;
   sensorData = fSensor->GetDataSheet();
-  if (!sensorData) { return kERROR; }
+  if (!sensorData) {
+    return kERROR;
+  }
   fSensorDataSheet = sensorData;
 
   fPixelSizeX = sensorData->GetPixelPitchX();
@@ -418,8 +419,8 @@ void CbmMvdSensorDigitizerTask::Exec()
   fDigiMatch->Clear("C");
 
 
-    //Int_t nDigis = 0;
-    GetEventInfo(fInputNr, fEventNr, fEventTime);
+  //Int_t nDigis = 0;
+  GetEventInfo(fInputNr, fEventNr, fEventTime);
 
   if (fInputPoints->GetEntriesFast() > 0) {
 
@@ -444,7 +445,9 @@ void CbmMvdSensorDigitizerTask::Exec()
         continue;
       }
       // Reject for the time being light nuclei (no digitization modell yet)
-      if (point->GetPdgCode() > 100000) { continue; }
+      if (point->GetPdgCode() > 100000) {
+        continue;
+      }
       // Digitize the point
       //LOG(debug) << " found point make digi";
       ProduceIonisationPoints(point);
@@ -552,9 +555,8 @@ void CbmMvdSensorDigitizerTask::FlushBuffer(CbmMvdPixelCharge* pixel, Int_t i)
 
   nDigis = fDigis->GetEntriesFast();
 
-  new ((*fDigis)[nDigis])
-    CbmMvdDigi(fSensor->GetSensorNr(), pixel->GetX(), pixel->GetY(), diodeCharge, fPixelSizeX, fPixelSizeY,
-               analogHitTime, fSensor->GetFrameNumber(analogHitTime, pixel->GetY()));
+  new ((*fDigis)[nDigis]) CbmMvdDigi(fSensor->GetSensorNr(), pixel->GetX(), pixel->GetY(), diodeCharge, fPixelSizeX,
+                                     fPixelSizeY, analogHitTime, fSensor->GetFrameNumber(analogHitTime, pixel->GetY()));
 
 
   new ((*fOutputBuffer)[nDigis])
@@ -568,9 +570,9 @@ void CbmMvdSensorDigitizerTask::FlushBuffer(CbmMvdPixelCharge* pixel, Int_t i)
   CbmMatch* match = (CbmMatch*) fDigiMatch->At(nDigis);
   for (Int_t iLink = 0; iLink < pixel->GetNContributors(); iLink++) {
 
-  if (pixel->GetTrackID()[iLink] > -2) {
-      match->AddLink((Double_t) pixel->GetPointWeight()[iLink], pixel->GetPointID()[iLink],
-                     pixel->GetEventNr()[iLink], pixel->GetInputNr()[iLink]);
+    if (pixel->GetTrackID()[iLink] > -2) {
+      match->AddLink((Double_t) pixel->GetPointWeight()[iLink], pixel->GetPointID()[iLink], pixel->GetEventNr()[iLink],
+                     pixel->GetInputNr()[iLink]);
       //      std::cout << "CbmMvdSensorDigitizerTask::ProduceDigis() : PointID= " << pixel->GetPointID()[iLink] << std::endl;
     }
 
@@ -636,7 +638,9 @@ Int_t CbmMvdSensorDigitizerTask::CheckForHit(CbmMvdPixelCharge* pixel)
   //   for(Int_t i=0; i<pixel->GetNContributors(); i++){ std::cout << " " << chargeArray[i];}
   //   std::cout << std::endl;
 
-  if (pixel->GetEarliestHitCharge() > fSensorDataSheet->GetAnalogThreshold()) { return 0; }
+  if (pixel->GetEarliestHitCharge() > fSensorDataSheet->GetAnalogThreshold()) {
+    return 0;
+  }
   /* The pixel fired immedeately, easiest case.else ...
    * Else: Check if a later impact fired the pixel
    */
@@ -652,7 +656,9 @@ Int_t CbmMvdSensorDigitizerTask::CheckForHit(CbmMvdPixelCharge* pixel)
     // pixel->GetCharge[i] stands for the charge of the particle under study, GetPixelCharge wraps up the history.
 
     charge = pixel->GetCharge()[i] + GetPixelCharge(pixel, pixel->GetTime()[i]);
-    if (charge > fSensorDataSheet->GetAnalogThreshold()) { return i; }
+    if (charge > fSensorDataSheet->GetAnalogThreshold()) {
+      return i;
+    }
   }
 
   return -1;
@@ -673,7 +679,9 @@ Int_t CbmMvdSensorDigitizerTask::GetPixelCharge(CbmMvdPixelCharge* myPixel, Doub
 
   for (Int_t hitNr = 0; hitNr < nHits; hitNr++) {
     Int_t hitTime = myPixel->GetTime()[hitNr];
-    if (hitTime > readoutTime) { break; }
+    if (hitTime > readoutTime) {
+      break;
+    }
     Int_t hitCharge = myPixel->GetCharge()[hitNr];
 
     //pixelCharge=pixelCharge+hitCharge;
@@ -845,7 +853,9 @@ void CbmMvdSensorDigitizerTask::ProduceIonisationPoints(CbmMvdPoint* point)
   Double_t rawLength   = sqrt(lx * lx + ly * ly + lz * lz);  //length of the track inside the epi-layer, in cm
   Double_t trackLength = 0;
 
-  if (rawLength < 1.0e+3) { trackLength = rawLength; }
+  if (rawLength < 1.0e+3) {
+    trackLength = rawLength;
+  }
 
   else {
     LOG(warning) << GetName() << " : rawlength > 1.0e+3 : " << rawLength;
@@ -857,9 +867,13 @@ void CbmMvdSensorDigitizerTask::ProduceIonisationPoints(CbmMvdPoint* point)
 
   LOG(debug) << "CbmMvdSensorTask:: ProduceIonisationPoints() : LandauCharge = " << charge << endl;
 
-  if (charge > (12000 / fLandauMPV)) { charge = 12000 / fLandauMPV; }  //limit Random generator behaviour
+  if (charge > (12000 / fLandauMPV)) {
+    charge = 12000 / fLandauMPV;
+  }  //limit Random generator behaviour
 
-  if (fShowDebugHistos) { fRandomGeneratorTestHisto->Fill(charge * fLandauMPV); }
+  if (fShowDebugHistos) {
+    fRandomGeneratorTestHisto->Fill(charge * fLandauMPV);
+  }
   //Translate the charge to normalized energy
 
   //     LOG(debug) << "charge after random generator " << charge;
@@ -967,7 +981,9 @@ void CbmMvdSensorDigitizerTask::ProducePixelCharge(CbmMvdPoint* point)
   yLo = sPoint->y - fWidthOfCluster * sigmaY;
   yUp = sPoint->y + fWidthOfCluster * sigmaY;
 
-  if (fNumberOfSegments < 2) { LOG(fatal) << "fNumberOfSegments < 2, this makes no sense, check parameters."; }
+  if (fNumberOfSegments < 2) {
+    LOG(fatal) << "fNumberOfSegments < 2, this makes no sense, check parameters.";
+  }
 
   Int_t* lowerXArray = new Int_t[fNumberOfSegments];
   Int_t* upperXArray = new Int_t[fNumberOfSegments];
@@ -1017,10 +1033,18 @@ void CbmMvdSensorDigitizerTask::ProducePixelCharge(CbmMvdPoint* point)
     if (upperXArray[i] > fNPixelsX) upperXArray[i] = fNPixelsX;
     if (upperYArray[i] > fNPixelsY) upperYArray[i] = fNPixelsY;
 
-    if (ixLo > lowerXArray[i]) { ixLo = lowerXArray[i]; }
-    if (ixUp < upperXArray[i]) { ixUp = upperXArray[i]; }
-    if (iyLo > lowerYArray[i]) { iyLo = lowerYArray[i]; }
-    if (iyUp < upperYArray[i]) { iyUp = upperYArray[i]; }
+    if (ixLo > lowerXArray[i]) {
+      ixLo = lowerXArray[i];
+    }
+    if (ixUp < upperXArray[i]) {
+      ixUp = upperXArray[i];
+    }
+    if (iyLo > lowerYArray[i]) {
+      iyLo = lowerYArray[i];
+    }
+    if (iyUp < upperYArray[i]) {
+      iyUp = upperYArray[i];
+    }
   }
 
 
@@ -1045,10 +1069,18 @@ void CbmMvdSensorDigitizerTask::ProducePixelCharge(CbmMvdPoint* point)
       for (Int_t i = 0; i < fNumberOfSegments; ++i) {
         // LOG(debug) << "check segment nr. " << i << " from " << fNumberOfSegments;
         // ignore pads, which are out of reach for this segments
-        if (ix < lowerXArray[i]) { continue; }
-        if (iy < lowerYArray[i]) { continue; }
-        if (ix > upperXArray[i]) { continue; }
-        if (iy > upperYArray[i]) { continue; }
+        if (ix < lowerXArray[i]) {
+          continue;
+        }
+        if (iy < lowerYArray[i]) {
+          continue;
+        }
+        if (ix > upperXArray[i]) {
+          continue;
+        }
+        if (iy > upperYArray[i]) {
+          continue;
+        }
 
         // LOG(debug) << "found vallied pad " << i;
         sPoint = &fSignalPoints[i];
@@ -1143,7 +1175,9 @@ void CbmMvdSensorDigitizerTask::ProducePixelCharge(CbmMvdPoint* point)
       LOG(debug) << "CbmMvdSensorDigitizerTask::ProducePixelCharge() - EndOfBusyTime =  "<< endOfBusyTime;
  */
 
-      if (endOfBusyTime > pixelCharge->GetEndOfBusyTime()) { pixelCharge->SetEndOfBusyTime(endOfBusyTime); }
+      if (endOfBusyTime > pixelCharge->GetEndOfBusyTime()) {
+        pixelCharge->SetEndOfBusyTime(endOfBusyTime);
+      }
 
       /* Next, the pixelChargeObject is combined with a time information on the endOfBusyTime of the pixelChargeObject.
        * This end of busy is reached once the related channel is ready for receiving new hit information.
@@ -1243,7 +1277,9 @@ void CbmMvdSensorDigitizerTask::InitTask(CbmMvdSensor* mySensor)
   fOutputBuffer = new TClonesArray("CbmMvdDigi", 100);
   fInputPoints  = new TClonesArray("CbmMvdPoint", 100);
 
-  if (!fSensor) { LOG(fatal) << "Init(CbmMvdSensor*) called without valid pointer, don't know how to proceed."; };
+  if (!fSensor) {
+    LOG(fatal) << "Init(CbmMvdSensor*) called without valid pointer, don't know how to proceed.";
+  };
 
   ReadSensorInformation();
 
diff --git a/sim/detectors/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.h b/sim/detectors/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.h
index 3f606067c322d6ac6b85795f2d248a8816f03c68..31b5fe2586cf1520f28b0e8fbc26e9c1a11338a5 100644
--- a/sim/detectors/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.h
+++ b/sim/detectors/mvd/plugins/tasks/CbmMvdSensorDigitizerTask.h
@@ -48,7 +48,7 @@ class TRefArray;
 
 class CbmMvdSensorDigitizerTask : public CbmMvdSensorTask {
 
-public:
+ public:
   /** Default constructor **/
   CbmMvdSensorDigitizerTask();
   CbmMvdSensorDigitizerTask(Int_t iMode);
@@ -105,7 +105,7 @@ public:
 
 
   //protected:
-public:
+ public:
   // ----------   Protected data members  ------------------------------------
 
   // Information about event and sensor status
@@ -182,7 +182,7 @@ public:
 
   Bool_t fproduceNoise;
 
-  Bool_t fEventMode {kFALSE};
+  Bool_t fEventMode{kFALSE};
 
   std::vector<CbmMvdPixelCharge*> fPixelChargeShort;
 
@@ -191,7 +191,7 @@ public:
   std::map<std::pair<Int_t, Int_t>, CbmMvdPixelCharge*>::iterator fChargeMapIt;
 
 
-private:
+ private:
   CbmMvdSensorDataSheet* fSensorDataSheet;
 
   /** Hit producer mode (0 = MAPS, 1 = Ideal) **/
@@ -298,7 +298,7 @@ private:
   TH2F* h_ElossVsMomIn;
 
 
-private:
+ private:
   CbmMvdSensorDigitizerTask(const CbmMvdSensorDigitizerTask&);
   CbmMvdSensorDigitizerTask operator=(const CbmMvdSensorDigitizerTask&);
 
diff --git a/sim/response/base/CbmDigitization.cxx b/sim/response/base/CbmDigitization.cxx
index 17ad66d1d14b3b083ee16b12da22730d7dc2ae30..dd00374316cf209a44e286764f55aa9ac0257c32 100644
--- a/sim/response/base/CbmDigitization.cxx
+++ b/sim/response/base/CbmDigitization.cxx
@@ -144,7 +144,7 @@ Int_t CbmDigitization::CreateDefaultDigitizers()
     // --- Skip if a digitizer was set explicitly
     if (it->second->GetDigitizer() != nullptr) continue;
 
-/*
+    /*
     // --- Skip MVD for time-based mode
     if (it->first == ECbmModuleId::kMvd && fMode == Mode::Timebased) {
       LOG(info) << "MVD digitizer is not available "