diff --git a/reco/L1/CbmL1.cxx b/reco/L1/CbmL1.cxx
index d5e83ce1fa3e6a6ab98d9e5fbbd5008879799c56..0182c1ad2aa48048e5e532520cd97eed6d0501a7 100644
--- a/reco/L1/CbmL1.cxx
+++ b/reco/L1/CbmL1.cxx
@@ -68,10 +68,10 @@
 #include <list>
 
 #include "L1Algo/L1Algo.h"
+#include "L1Algo/L1Assert.h"
 #include "L1Algo/L1Branch.h"
 #include "L1Algo/L1Field.h"
 #include "L1Algo/L1Hit.h"
-#include "L1Algo/L1Assert.h"
 #include "L1AlgoInputData.h"
 #include "L1Event.h"
 
diff --git a/reco/L1/L1Algo/L1Algo.cxx b/reco/L1/L1Algo/L1Algo.cxx
index fb284671321e0516b47cca0d6b18eae9466e76f6..81b39ed6ad14e4dc1066e6e4dd77ac339f5f685d 100644
--- a/reco/L1/L1Algo/L1Algo.cxx
+++ b/reco/L1/L1Algo/L1Algo.cxx
@@ -130,7 +130,7 @@ void L1Algo::Init(const L1Vector<fscal>& geo, const bool UseHitErrors, const Tra
     double f_sigma = geo[ind++];
     double b_phi   = geo[ind++];
     double b_sigma = geo[ind++];
-    double dt      = geo[ind++]; //TODO: Add this field to L1BaseStationInfo and to ToString fcn (S.Zharko)
+    double dt      = geo[ind++];  //TODO: Add this field to L1BaseStationInfo and to ToString fcn (S.Zharko)
     double c_f     = cos(f_phi);
     double s_f     = sin(f_phi);
     double c_b     = cos(b_phi);
diff --git a/reco/L1/L1Algo/L1Algo.h b/reco/L1/L1Algo/L1Algo.h
index 670211ee1c5006a2adc8cc010d2a8f6457492aeb..b80d01f9c5c73902f3b5a79f381d53b6f65042fa 100644
--- a/reco/L1/L1Algo/L1Algo.h
+++ b/reco/L1/L1Algo/L1Algo.h
@@ -40,7 +40,7 @@ class L1AlgoDraw;
 /*********************************************************************************
  ************ TEMPORARY MACROS, SHOULD BE REMOVED (TODO!!, S. Zharko)  ***********
  *                                                                               */
- 
+
 #define FEATURING_L1ALGO_INIT 1  // If defined, new initialization will be used, if not - the old one
 // Macro: 1 - new track finder loop, other - old track finder loop
 #define FEATURING_L1ALGO_CATRACKFINDER_ITERATIONLOOP 1
diff --git a/reco/L1/L1Algo/L1Assert.h b/reco/L1/L1Algo/L1Assert.h
index a08eca931546d06733e55d27227bfb613f3de124..d285846274741d84b841a92a96ff397a10a4889a 100644
--- a/reco/L1/L1Algo/L1Assert.h
+++ b/reco/L1/L1Algo/L1Assert.h
@@ -21,23 +21,26 @@
 #define L1ASSERT(LEVEL, COND)
 #define L1MASSERT(LEVEL, COND, MSG)
 #else
-#define L1ASSERT(LEVEL, COND) L1Assert::DoAssertion<(LEVEL) <= L1Assert::kAssertionLevel>((LEVEL), (COND), (#COND), __FILE__, __LINE__)
-#define L1MASSERT(LEVEL, COND, MSG) L1Assert::DoAssertion<(LEVEL) <= L1Assert::kAssertionLevel>((LEVEL), (COND), (MSG), __FILE__, __LINE__)
-#endif // defined(NDEBUG) || defined(L1_NO_ASSERT)
+#define L1ASSERT(LEVEL, COND)                                                                                          \
+  L1Assert::DoAssertion<(LEVEL) <= L1Assert::kAssertionLevel>((LEVEL), (COND), (#COND), __FILE__, __LINE__)
+#define L1MASSERT(LEVEL, COND, MSG)                                                                                    \
+  L1Assert::DoAssertion<(LEVEL) <= L1Assert::kAssertionLevel>((LEVEL), (COND), (MSG), __FILE__, __LINE__)
+#endif  // defined(NDEBUG) || defined(L1_NO_ASSERT)
 
-namespace L1Assert {
+namespace L1Assert
+{
   /// Assertion levels
-  /// 0 - 
-  /// 1 - 
-  /// 2 - 
+  /// 0 -
+  /// 1 -
+  /// 2 -
   constexpr int kAssertionLevel {1};
-  
+
   /// Basic template function. Usage: place "level >= L1Assert::kAssertionLevel"
   //template <bool IsAsserted>
   //int DoAssertion (int level, bool condition, const char* msg, const char* fileName, int lineNo);
 
   /// Specialization in case of IsAsserted = true, i.e. the assertion is made
-  template <bool IsAsserted>
+  template<bool IsAsserted>
   int DoAssertion(int level, bool condition, const char* msg, const char* fileName, int lineNo)
   {
     if (!condition) {
@@ -48,8 +51,12 @@ namespace L1Assert {
   }
 
   /// Specialization in case of IsAsserted = false, i.e. the assertion is not made
-  template <>
-  constexpr int DoAssertion<false>(int /*level*/, bool /*condition*/, const char* /*msg*/, const char* /*fileName*/, int /*lineNo*/) { return 0; }
-};
+  template<>
+  constexpr int DoAssertion<false>(int /*level*/, bool /*condition*/, const char* /*msg*/, const char* /*fileName*/,
+                                   int /*lineNo*/)
+  {
+    return 0;
+  }
+};  // namespace L1Assert
 
-#endif // L1Assert_h
+#endif  // L1Assert_h
diff --git a/reco/L1/L1Algo/L1BaseStationInfo.cxx b/reco/L1/L1Algo/L1BaseStationInfo.cxx
index 0ad560312afa0867d120d329aa86ccc57adeb72d..648cb0fd32f06692b5cbb38ff3da68be1c7ebc37 100644
--- a/reco/L1/L1Algo/L1BaseStationInfo.cxx
+++ b/reco/L1/L1Algo/L1BaseStationInfo.cxx
@@ -439,28 +439,3 @@ std::string L1BaseStationInfo::ToString(int verbosityLevel, int indentLevel) con
   }
   return aStream.str();
 }
-
-//----------------------------------------------------------------------------------------------------------------------//
-//
-std::string L1BaseStationInfo::ToString(int verbosityLevel, int indentLevel) const
-{
-  std::stringstream aStream {};
-  constexpr char indentChar = '\t';
-  std::string indent(indentLevel, indentChar);
-
-  if (verbosityLevel == 0) {
-    aStream << indent << "L1BaseStationInfo object: {stationID, detectorID, address} = {" << fStationID << ", "
-            << static_cast<int>(fDetectorID) << ", " << this << '}';
-  }
-  else if (verbosityLevel > 0) {
-    aStream << indent << "L1BaseStationInfo object: at " << this << '\n';
-    aStream << indent << indentChar << "Station ID:              " << fStationID << '\n';
-    aStream << indent << indentChar << "Detector ID:             " << static_cast<int>(fDetectorID) << '\n';
-    aStream << indent << indentChar << "L1Station object:" << '\n';
-    aStream << fL1Station.ToString(verbosityLevel - 1, indentLevel + 1) << '\n';
-    aStream << indent << indentChar << "Additional fields:\n";
-    aStream << indent << indentChar << indentChar << "Xmax:                    " << fXmax << '\n';
-    aStream << indent << indentChar << indentChar << "Ymax:                    " << fYmax << '\n';
-  }
-  return aStream.str();
-}