diff --git a/analysis/common/analysis_tree_converter/CbmConverterManager.h b/analysis/common/analysis_tree_converter/CbmConverterManager.h
index 98e15edc0d4cd3468efbd34688f006de06a62203..0ddb1c0fd7659ffbe2ea64c0ac3ac45eaaa79398 100644
--- a/analysis/common/analysis_tree_converter/CbmConverterManager.h
+++ b/analysis/common/analysis_tree_converter/CbmConverterManager.h
@@ -1,6 +1,8 @@
 #ifndef ANALYSIS_TREE_CONVERTERMANAGER_H_
 #define ANALYSIS_TREE_CONVERTERMANAGER_H_
 
+#include <utility>
+
 #include "FairTask.h"
 
 #include "AnalysisTree/TaskManager.hpp"
@@ -31,7 +33,7 @@ public:
   void SetBeamMomentum(float beam_mom) { beam_mom_ = beam_mom; }
 
   void SetOutputName(std::string file, std::string tree = "aTree") {
-    task_manager_->SetOutputName(file, tree);
+    task_manager_->SetOutputName(std::move(file), std::move(tree));
   }
 
 private:
diff --git a/analysis/common/analysis_tree_converter/CbmConverterTask.h b/analysis/common/analysis_tree_converter/CbmConverterTask.h
index d88e6302759236d35698ef71b09a6fd198ddfbde..34588f8fd5f9ed451725b84b267d00729de14329 100644
--- a/analysis/common/analysis_tree_converter/CbmConverterTask.h
+++ b/analysis/common/analysis_tree_converter/CbmConverterTask.h
@@ -3,6 +3,9 @@
 
 #include "AnalysisTree/Task.hpp"
 
+#include <map>
+#include <string>
+
 class FairRootManager;
 
 class CbmConverterTask : public AnalysisTree::Task {
diff --git a/analysis/common/analysis_tree_converter/CbmPsdModulesConverter.cxx b/analysis/common/analysis_tree_converter/CbmPsdModulesConverter.cxx
index 0b1e02539394f73fdc49c7ab19c169e049f9a4a5..b3a1ca227bc686c1dabd7f799389e049f9ca53f6 100644
--- a/analysis/common/analysis_tree_converter/CbmPsdModulesConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmPsdModulesConverter.cxx
@@ -6,7 +6,6 @@
 
 #include "FairRootManager.h"
 
-#include "AnalysisTree/DataHeader.hpp"
 #include "AnalysisTree/Detector.hpp"
 
 #include "CbmPsdHit.h"
@@ -60,7 +59,6 @@ void CbmPsdModulesConverter::Exec() {
   //  config_.GetBranchConfig(rec_event_header_->GetId() ).GetFieldId("Epsd"));
 }
 
-void CbmPsdModulesConverter::Finish() {
-  //  delete psd_modules_;
-}
+void CbmPsdModulesConverter::Finish() {}
+
 CbmPsdModulesConverter::~CbmPsdModulesConverter() { delete psd_modules_; };
diff --git a/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.cxx b/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.cxx
index 0d744b92e6594c9411d2e8b42e1f34d6718b159d..114de6a864ab03a99f8877371e9ddba0ecd85798 100644
--- a/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.cxx
@@ -44,8 +44,6 @@ void CbmRecEventHeaderConverter::Exec() {
     return;
   }
 
-  //  std::cout << cbm_prim_vertex_->GetX() << " " << cbm_prim_vertex_->GetY() << " " << cbm_prim_vertex_->GetZ() << std::endl;
-
   rec_event_header_->SetVertexPosition3({cbm_prim_vertex_->GetX(),
                                          cbm_prim_vertex_->GetY(),
                                          cbm_prim_vertex_->GetZ()});
diff --git a/analysis/common/analysis_tree_converter/CbmRichRingsConverter.cxx b/analysis/common/analysis_tree_converter/CbmRichRingsConverter.cxx
index cc7a411ffca24f84cffd9f3814b30b71c1e5f352..77e5036731ef7645bceb159f6537c2406985c925 100644
--- a/analysis/common/analysis_tree_converter/CbmRichRingsConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmRichRingsConverter.cxx
@@ -10,7 +10,6 @@
 
 #include <AnalysisTree/TaskManager.hpp>
 #include <CbmGlobalTrack.h>
-#include <CbmTrackMatchNew.h>
 #include <rich/CbmRichRing.h>
 
 #include "CbmRichRingsConverter.h"
diff --git a/analysis/common/analysis_tree_converter/CbmSimTracksConverter.cxx b/analysis/common/analysis_tree_converter/CbmSimTracksConverter.cxx
index 10c7e56bd8a80488447af7103a5b0fb37288837f..7e621882e8b7cbf474e29a4c2b7b05c323cf2bf9 100644
--- a/analysis/common/analysis_tree_converter/CbmSimTracksConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmSimTracksConverter.cxx
@@ -37,7 +37,6 @@ void CbmSimTracksConverter::Exec() {
   assert(cbm_mc_tracks_);
   out_indexes_map_.clear();
 
-  //  std::cout << "ReadMcTracks" << std::endl;
   sim_tracks_->ClearChannels();
   auto* out_config_  = AnalysisTree::TaskManager::GetInstance()->GetConfig();
   const auto& branch = out_config_->GetBranchConfig(out_branch_);
@@ -48,9 +47,6 @@ void CbmSimTracksConverter::Exec() {
   const int in_hits    = branch.GetFieldId("n_hits_mvd");
   const int icbm_id    = branch.GetFieldId("cbmroot_id");
 
-  //  std::cout << "cbm_mc_tracks_->GetEntries() = " << nMcTracks << std::endl;
-  //  std::cout << imother_id << "  " << igeant_id << "  " << in_hits << std::endl;
-
   sim_tracks_->Reserve(nMcTracks);
 
   for (int iMcTrack = 0; iMcTrack < nMcTracks; ++iMcTrack) {
@@ -71,8 +67,8 @@ void CbmSimTracksConverter::Exec() {
     track.SetField(int(mctrack->GetNPoints(ECbmModuleId::kTrd)), in_hits + 2);
     track.SetField(int(mctrack->GetUniqueID()), icbm_id);
 
-    if (mctrack->GetMotherId()
-        == -1) {  // mother id should < than track id, so we can do it here
+    // mother id should < than track id, so we can do it here
+    if (mctrack->GetMotherId() == -1) {
       track.SetField(int(-1), imother_id);
     } else {
       auto p = out_indexes_map_.find(mctrack->GetMotherId());
diff --git a/analysis/common/analysis_tree_converter/CbmStsTracksConverter.h b/analysis/common/analysis_tree_converter/CbmStsTracksConverter.h
index 4eef6df46589edc796cf568601141b5b1eaa0a81..94d3602c216cb9c462437da83d470b7885270639 100644
--- a/analysis/common/analysis_tree_converter/CbmStsTracksConverter.h
+++ b/analysis/common/analysis_tree_converter/CbmStsTracksConverter.h
@@ -44,10 +44,8 @@ private:
   bool IsGoodCovMatrix(const CbmStsTrack* sts_track) const;
   int GetMcPid(const CbmTrackMatchNew* match, AnalysisTree::Track& track) const;
 
-  AnalysisTree::TrackDetector* vtx_tracks_ {
-    nullptr};  ///< raw pointers are needed for TTree::Branch
-  AnalysisTree::Matching* vtx_tracks_2_sim_ {
-    nullptr};  ///< raw pointers are needed for TTree::Branch
+  AnalysisTree::TrackDetector* vtx_tracks_ {nullptr};  ///< raw pointers are needed for TTree::Branch
+  AnalysisTree::Matching* vtx_tracks_2_sim_ {nullptr};  ///< raw pointers are needed for TTree::Branch
 
   CbmVertex* cbm_prim_vertex_ {nullptr};    ///< non-owning pointer
   TClonesArray* cbm_mc_tracks_ {nullptr};   ///< non-owning pointer
diff --git a/analysis/common/analysis_tree_converter/CbmTofHitsConverter.cxx b/analysis/common/analysis_tree_converter/CbmTofHitsConverter.cxx
index 59cb803f569fb2fadf5df958b7143f4c4cf68f34..8f1b5fcc15eb17e2ea4bece14a24dc5b88f93a9c 100644
--- a/analysis/common/analysis_tree_converter/CbmTofHitsConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmTofHitsConverter.cxx
@@ -10,7 +10,6 @@
 
 #include <AnalysisTree/TaskManager.hpp>
 #include <CbmGlobalTrack.h>
-#include <CbmMCTrack.h>
 #include <CbmTofHit.h>
 #include <CbmTrackMatchNew.h>
 
diff --git a/analysis/common/analysis_tree_converter/CbmTrdTracksConverter.cxx b/analysis/common/analysis_tree_converter/CbmTrdTracksConverter.cxx
index 80e5fec31ff90d76c7a67667781937cfe7532c45..e73de281357e124a329b887051868d7322668382 100644
--- a/analysis/common/analysis_tree_converter/CbmTrdTracksConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmTrdTracksConverter.cxx
@@ -16,8 +16,6 @@
 #include <CbmTrdHit.h>
 #include <CbmTrdTrack.h>
 
-#include "CbmTrdTracksConverter.h"
-
 ClassImp(CbmTrdTracksConverter)
 
   void CbmTrdTracksConverter::Init() {
@@ -32,7 +30,7 @@ ClassImp(CbmTrdTracksConverter)
   AnalysisTree::BranchConfig trd_branch(out_branch_,
                                         AnalysisTree::DetType::kTrack);
   trd_branch.AddFields<float>(
-    {"energy_loss_0", "energy_loss_1", "energy_loss_2", "energy_loss_3"}, "Energy loss per TRD station");
+    {"energy_loss_0", "energy_loss_1", "energy_loss_2", "energy_loss_3"}, "keV(?), Energy loss per TRD station");
   trd_branch.AddFields<float>(
     {"pid_like_e", "pid_like_pi", "pid_like_k", "pid_like_p"}, "Probability to be a given particle specie");
   trd_branch.AddField<float>("chi2_ov_ndf", "chi2 divided by NDF of the track fit");