diff --git a/MQ/hitbuilder/CbmDeviceHitBuilderTof.cxx b/MQ/hitbuilder/CbmDeviceHitBuilderTof.cxx
index 5ced4dcd97c177751b76711595e3eaeccecc7712..d750ce4184f06c4b03a24fc5b247a96d1ebd8402 100644
--- a/MQ/hitbuilder/CbmDeviceHitBuilderTof.cxx
+++ b/MQ/hitbuilder/CbmDeviceHitBuilderTof.cxx
@@ -217,7 +217,9 @@ CbmDeviceHitBuilderTof::CbmDeviceHitBuilderTof()
   , fOutHstFileName("")
   , fOutRootFileName("")
   , fCalParFile(NULL)
-  , fOutRootFile(NULL) {}
+  , fOutRootFile(NULL)
+{
+}
 
 CbmDeviceHitBuilderTof::~CbmDeviceHitBuilderTof() {
   if (NULL != fOutRootFile) {
diff --git a/MQ/mcbm/CbmDeviceMcbmEventSink.cxx b/MQ/mcbm/CbmDeviceMcbmEventSink.cxx
index f9dfbab2c369dd8a01c81c9439ce6333a04bd266..6da8cb489f86a9379967f640800ece1e18a5adbe 100644
--- a/MQ/mcbm/CbmDeviceMcbmEventSink.cxx
+++ b/MQ/mcbm/CbmDeviceMcbmEventSink.cxx
@@ -378,10 +378,8 @@ bool CbmDeviceMcbmEventSink::HandleData(FairMQParts& parts, int /*index*/) {
   else {
     LOG(debug) << "TS direct to storage";
     /// If not consecutive to last TS sent,
-    fmFullTsStorage.emplace_hint(
-      fmFullTsStorage.end(),
-      std::pair<uint64_t, CbmUnpackedTimeslice>(
-        fTsMetaData->GetIndex(), CbmUnpackedTimeslice(parts)));
+    fmFullTsStorage.emplace_hint(fmFullTsStorage.end(), std::pair<uint64_t, CbmUnpackedTimeslice>(
+                                                          fTsMetaData->GetIndex(), CbmUnpackedTimeslice(parts)));
   }  // else of if( fuPrevTsIndex + 1 == fTsMetaData->GetIndex() ||  ( 0 == fuPrevTsIndex && 0 == fulTsCounter && 0 == fTsMetaData->GetIndex() )
   LOG(debug) << "TS metadata checked";
 
diff --git a/analysis/common/analysis_tree_converter/CbmTrdTracksConverter.cxx b/analysis/common/analysis_tree_converter/CbmTrdTracksConverter.cxx
index 0ad8490f784f081b840060ba9c9cb31711b6815c..00a51129d6897ed1a721f30cc0d8af3ccb424d97 100644
--- a/analysis/common/analysis_tree_converter/CbmTrdTracksConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmTrdTracksConverter.cxx
@@ -77,8 +77,8 @@ void CbmTrdTracksConverter::FillTrdTracks() {
     if (itrd < 0) continue;
 
     auto trd_track = static_cast<CbmTrdTrack*>(cbm_trd_tracks_->At(itrd));
-//    auto trd_match = static_cast<CbmTrackMatchNew*>(cbm_trd_tracks_->At(itrd));
-//    Int_t itrdMC   = (trd_match ? trd_match->GetMatchedLink().GetIndex() : -1);
+    //    auto trd_match = static_cast<CbmTrackMatchNew*>(cbm_trd_tracks_->At(itrd));
+    //    Int_t itrdMC   = (trd_match ? trd_match->GetMatchedLink().GetIndex() : -1);
 
     auto& track = trd_tracks_->AddChannel(branch);
     TVector3 mom, mom_last;
diff --git a/core/data/tof/CbmTofDetectorId.h b/core/data/tof/CbmTofDetectorId.h
index 528eccd138fa61dc980c153ee651d8708e8e7062..631ba130c25e33d5e4deb702eae89bc5aff33879 100644
--- a/core/data/tof/CbmTofDetectorId.h
+++ b/core/data/tof/CbmTofDetectorId.h
@@ -29,12 +29,7 @@ public:
     , fCell(0)
     , fCounterType(0) {};
 
-  CbmTofDetectorInfo(Int_t detsystem,
-                     Int_t smtype,
-                     Int_t smodule,
-                     Int_t counter,
-                     Int_t gap,
-                     Int_t cell)
+  CbmTofDetectorInfo(Int_t detsystem, Int_t smtype, Int_t smodule, Int_t counter, Int_t gap, Int_t cell)
     : fDetectorSystem(detsystem)
     , fSMtype(smtype)
     , fSModule(smodule)
@@ -43,12 +38,7 @@ public:
     , fCell(cell)
     , fCounterType(0) {};
 
-  CbmTofDetectorInfo(ECbmModuleId detsystem,
-                     Int_t smtype,
-                     Int_t smodule,
-                     Int_t counter,
-                     Int_t gap,
-                     Int_t cell)
+  CbmTofDetectorInfo(ECbmModuleId detsystem, Int_t smtype, Int_t smodule, Int_t counter, Int_t gap, Int_t cell)
     : fDetectorSystem(ToIntegralType(detsystem))
     , fSMtype(smtype)
     , fSModule(smodule)