diff --git a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.cxx b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.cxx
index 81a28a95742eb6e77a2dc86519863708196732e4..5d5345adb345967b6dad1d2680954ee0c737d594 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.cxx
@@ -52,7 +52,7 @@ Bool_t CbmMcbm2019TimeWinEventBuilderAlgo::InitAlgo() {
   fDigiMan = CbmDigiManager::Instance();
   if (fbUseMuchBeamtimeDigi) {
     fDigiMan->UseMuchBeamTimeDigi();
-  } // if (fbUseMuchBeamtimeDigi)
+  }  // if (fbUseMuchBeamtimeDigi)
   fDigiMan->Init();
 
   /// Check if reference detector data are available
@@ -234,11 +234,10 @@ void CbmMcbm2019TimeWinEventBuilderAlgo::LoopOnSeeds() {
     dTsStartTime  = pTsMetaData->GetStartTime();
     dOverlapStart = pTsMetaData->GetOverlapStartTime();
     dOverlapSize  = pTsMetaData->GetOverlapDuration();
-  } // if ( fdTsStartTime < 0 || fdTsLength < 0  || fdTsOverLength < 0 )
+  }  // if ( fdTsStartTime < 0 || fdTsLength < 0  || fdTsOverLength < 0 )
 
   /// Print warning in first TS if time window borders out of potential overlap
-  if ((0.0 < fdEarliestTimeWinBeg
-       && dOverlapSize < fdLatestTimeWinEnd)
+  if ((0.0 < fdEarliestTimeWinBeg && dOverlapSize < fdLatestTimeWinEnd)
       || (dOverlapSize < fdWidestTimeWinRange)) {
     LOG(warning) << "CbmMcbm2019TimeWinEventBuilderAlgo::LoopOnSeeds => "
                  << Form("Event window not fitting in TS overlap, risk of "
@@ -252,11 +251,9 @@ void CbmMcbm2019TimeWinEventBuilderAlgo::LoopOnSeeds() {
   /// Define an acceptance window for the seeds in order to use the overlap
   /// part of the TS to avoid incomplete events
   Double_t dSeedWindowBeg =
-    dTsStartTime
-    + (0.0 < fdEarliestTimeWinBeg ? 0.0 : -fdEarliestTimeWinBeg);
+    dTsStartTime + (0.0 < fdEarliestTimeWinBeg ? 0.0 : -fdEarliestTimeWinBeg);
   Double_t dSeedWindowEnd =
-    dOverlapStart
-    + (0.0 < fdEarliestTimeWinBeg ? 0.0 : -fdEarliestTimeWinBeg);
+    dOverlapStart + (0.0 < fdEarliestTimeWinBeg ? 0.0 : -fdEarliestTimeWinBeg);
   if (fbIgnoreTsOverlap) {
     dSeedWindowBeg = dTsStartTime;
     dSeedWindowEnd = dOverlapStart;
@@ -360,11 +357,11 @@ void CbmMcbm2019TimeWinEventBuilderAlgo::CheckSeed(Double_t dSeedTime,
       case ECbmModuleId::kMuch: {
         if (fbUseMuchBeamtimeDigi) {
           SearchMatches<CbmMuchBeamTimeDigi>(dSeedTime, fRefDet);
-        } // if (fbUseMuchBeamtimeDigi)
-          else
-          {
-            SearchMatches<CbmMuchDigi>(dSeedTime, fRefDet);
-          } // else of if (fbUseMuchBeamtimeDigi)
+        }  // if (fbUseMuchBeamtimeDigi)
+        else
+        {
+          SearchMatches<CbmMuchDigi>(dSeedTime, fRefDet);
+        }  // else of if (fbUseMuchBeamtimeDigi)
         break;
       }  // case ECbmModuleId::kMuch:
       case ECbmModuleId::kTrd: {
@@ -415,10 +412,10 @@ void CbmMcbm2019TimeWinEventBuilderAlgo::CheckSeed(Double_t dSeedTime,
       case ECbmModuleId::kMuch: {
         if (fbUseMuchBeamtimeDigi) {
           SearchMatches<CbmMuchBeamTimeDigi>(dSeedTime, *det);
-        } // if (fbUseMuchBeamtimeDigi)
-          else {
-            SearchMatches<CbmMuchDigi>(dSeedTime, *det);
-          } // else of if (fbUseMuchBeamtimeDigi)
+        }  // if (fbUseMuchBeamtimeDigi)
+        else {
+          SearchMatches<CbmMuchDigi>(dSeedTime, *det);
+        }  // else of if (fbUseMuchBeamtimeDigi)
         break;
       }  // case ECbmModuleId::kMuch:
       case ECbmModuleId::kTrd: {
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.h b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.h
index b6ed8a64568ee722b8fb0bbef9268da8ee30112f..6d6cc1d7dcd534bb5732bcc1313aaac626d26032 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.h
+++ b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderAlgo.h
@@ -217,10 +217,10 @@ private:
   static constexpr Double_t kdDefaultTimeWinEnd = 100.0;
 
   /// User parameters
-    /// Control flags
+  /// Control flags
   Bool_t fbIgnoreTsOverlap = kFALSE;  //! Ignore data in Overlap part of the TS
   Bool_t fbFillHistos {kTRUE};        //! Switch ON/OFF filling of histograms
-  Bool_t fbUseMuchBeamtimeDigi = kTRUE; //! Switch between the MUCH digi classes
+  Bool_t fbUseMuchBeamtimeDigi = kTRUE; //! Switch between MUCH digi classes
     /// Event building mode and detectors selection
   EOverlapMode fOverMode {EOverlapMode::AllowOverlap};
 
diff --git a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.cxx b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.cxx
index 34291a8cb20634010c462b8b49c20c35960abe18..e56e4ef92534de4c4d159e402e40c99073cfa8d4 100644
--- a/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbm2019TimeWinEventBuilderTask.cxx
@@ -170,12 +170,12 @@ void CbmMcbm2019TimeWinEventBuilderTask::SetTriggerWindow(ECbmModuleId det,
 }
 
 
-void CbmMcbm2019TimeWinEventBuilderTask::SetTsParameters(Double_t dTsStartTime,
-                                                         Double_t dTsLength,
-                                                         Double_t dTsOverLength) {
-  if (nullptr != fpAlgo) fpAlgo->SetTsParameters(dTsStartTime,
-                                                 dTsLength,
-                                                 dTsOverLength);
+void CbmMcbm2019TimeWinEventBuilderTask::SetTsParameters(
+  Double_t dTsStartTime,
+  Double_t dTsLength,
+  Double_t dTsOverLength) {
+  if (nullptr != fpAlgo)
+    fpAlgo->SetTsParameters(dTsStartTime, dTsLength, dTsOverLength);
 }
 
 void CbmMcbm2019TimeWinEventBuilderTask::SetEventOverlapMode(
@@ -185,7 +185,8 @@ void CbmMcbm2019TimeWinEventBuilderTask::SetEventOverlapMode(
 void CbmMcbm2019TimeWinEventBuilderTask::SetIgnoreTsOverlap(Bool_t bFlagIn) {
   if (nullptr != fpAlgo) fpAlgo->SetIgnoreTsOverlap(bFlagIn);
 }
-void CbmMcbm2019TimeWinEventBuilderTask::ChangeMuchBeamtimeDigiFlag(Bool_t bFlagIn) {
+void CbmMcbm2019TimeWinEventBuilderTask::ChangeMuchBeamtimeDigiFlag(
+  Bool_t bFlagIn) {
   if (nullptr != fpAlgo) fpAlgo->ChangeMuchBeamtimeDigiFlag(bFlagIn);
 }