diff --git a/core/detectors/trd/CbmTrdGeoHandler.cxx b/core/detectors/trd/CbmTrdGeoHandler.cxx
index e7e24345bc7285efb8614878a377219fb29ed06b..ed59e65ece82512b3d67b76ee7bb46a80047da93 100644
--- a/core/detectors/trd/CbmTrdGeoHandler.cxx
+++ b/core/detectors/trd/CbmTrdGeoHandler.cxx
@@ -233,7 +233,7 @@ void CbmTrdGeoHandler::NavigateTo(const TString& path)
         TString nDaughter(modulenode->GetDaughter(i)->GetName());
         if (!nDaughter.BeginsWith("radiator") && !nDaughter.BeginsWith("Radiator")) continue;
         fRadiatorType = 0;
-        // TODO define radiator (+ entrance window) types according to the naming convention 
+        // TODO define radiator (+ entrance window) types according to the naming convention
       }
     }
     else  // 2013 and earlier
diff --git a/core/detectors/trd/CbmTrdGeoHandler.h b/core/detectors/trd/CbmTrdGeoHandler.h
index 2201065db8376a5e24a5b1087977beb7a1cd4ca6..1f886e4d552c8c4d797449f5a4919d860f4ccfba 100644
--- a/core/detectors/trd/CbmTrdGeoHandler.h
+++ b/core/detectors/trd/CbmTrdGeoHandler.h
@@ -105,7 +105,7 @@ private:
   Int_t fLayerId;              //!
   Int_t fModuleId;             //!
   Int_t fModuleType;           //!
-  Int_t fRadiatorType;         //! radiator + chamber entrance window type 
+  Int_t fRadiatorType;         //! radiator + chamber entrance window type
   Int_t fRotation;             //! rotation angle 0,1,2,3
 
   // for backward compatibility
diff --git a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v21b.C b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v21b.C
index fd4adf5966d34376e180a5151f6c7447fb0131b3..f117fa877adff4e8273149a9ef1acad5d8061ef5 100644
--- a/macro/mcbm/geometry/trd/Create_TRD_Geometry_v21b.C
+++ b/macro/mcbm/geometry/trd/Create_TRD_Geometry_v21b.C
@@ -414,8 +414,8 @@ Double_t asic_distance;
 //const Double_t FrameWidth[2]    = { 1.5, 2.0 };   // Width of detector frames in cm
 const Double_t FrameWidth[4] = {1.5, 1.5, 2.5, 1.5};  // Width of detector frames in cm
 // mini - production
-const Double_t DetectorSizeX[4] = {57., 95., 59.0, 23.04 + 3.};   // => 54 x 54 cm2 & 91 x 91 cm2 active area
-const Double_t DetectorSizeY[4] = {57., 95., 60.8, 8.16 + 3.};  // quadratic modules
+const Double_t DetectorSizeX[4] = {57., 95., 59.0, 23.04 + 3.};  // => 54 x 54 cm2 & 91 x 91 cm2 active area
+const Double_t DetectorSizeY[4] = {57., 95., 60.8, 8.16 + 3.};   // quadratic modules
 //// default
 //const Double_t DetectorSizeX[2] = { 60., 100.};   // => 57 x 57 cm2 & 96 x 96 cm2 active area
 //const Double_t DetectorSizeY[2] = { 60., 100.};   // quadratic modules
diff --git a/sim/detectors/trd/CbmTrdDigitizer.cxx b/sim/detectors/trd/CbmTrdDigitizer.cxx
index ac2177256accf157e7b281c940fae9ce409e88e2..59342ccc1964d9394a9b7912b8c95215e6c6845d 100644
--- a/sim/detectors/trd/CbmTrdDigitizer.cxx
+++ b/sim/detectors/trd/CbmTrdDigitizer.cxx
@@ -309,7 +309,7 @@ CbmTrdModuleSim* CbmTrdDigitizer::AddModule(Int_t detId)
       SetUseFASP();
     module = fModuleMap[moduleAddress] = new CbmTrdModuleSimT(moduleAddress, lyId, orientation, UseFASP());
     Int_t rType(-1);
-    if ( (rType = geoHandler.GetRadiatorType(path)) >= 0 ) {
+    if ((rType = geoHandler.GetRadiatorType(path)) >= 0) {
       if (!fRadiator2D) {  // strong TRD-2D entrance window
         //   const Char_t *ewin = "Al;C;Air;C;Al";
         const Char_t* ewin = "Al;C;HC;C;Al";
diff --git a/sim/detectors/trd/CbmTrdDigitizer.h b/sim/detectors/trd/CbmTrdDigitizer.h
index 642eee285e54fdac4421e38706d5e6f7c29770ac..a4fe73831613a95504eb92c7221bac6c84d9c124 100644
--- a/sim/detectors/trd/CbmTrdDigitizer.h
+++ b/sim/detectors/trd/CbmTrdDigitizer.h
@@ -138,7 +138,7 @@ private:
   CbmTrdParSetGain* fGainPar;  ///< parameter list for keV->ADC gain conversion
   CbmTrdParSetGeo* fGeoPar;    ///< parameter list for geometry definitions
   CbmTrdRadiator* fRadiator;   ///< parametrization of radiator TR yield
-  CbmTrdRadiator* fRadiator2D; ///< parametrization of 2D radiator TR yield
+  CbmTrdRadiator* fRadiator2D;  ///< parametrization of 2D radiator TR yield
 
   CbmTrdRawToDigiR* fConverter;
   CbmTrdCheckUtil* fQA;
diff --git a/sim/detectors/trd/CbmTrdModuleSimT.cxx b/sim/detectors/trd/CbmTrdModuleSimT.cxx
index 9de8a685e4be815e7f7f8594ef462ac69e6e3c86..94a181046e06010616a109e6378b24632a598f0d 100644
--- a/sim/detectors/trd/CbmTrdModuleSimT.cxx
+++ b/sim/detectors/trd/CbmTrdModuleSimT.cxx
@@ -43,7 +43,7 @@ using namespace std;
 //_________________________________________________________________________________
 CbmTrdModuleSimT::CbmTrdModuleSimT(Int_t mod, Int_t ly, Int_t rot, Bool_t FASP)
   : CbmTrdModuleSim(mod, ly, rot)
-  , fConfig( 0 )
+  , fConfig(0)
   , fTriangleBinning(NULL)
   , fFASP(NULL)
   , fTimeSlice(NULL)
diff --git a/sim/detectors/trd/CbmTrdModuleSimT.h b/sim/detectors/trd/CbmTrdModuleSimT.h
index 1308429d84bdd4b1387a2bc9647f8aa621e27ffd..48013813ab01e73672fef7880299407a5aacc8d2 100644
--- a/sim/detectors/trd/CbmTrdModuleSimT.h
+++ b/sim/detectors/trd/CbmTrdModuleSimT.h
@@ -51,11 +51,12 @@ public:
   void SetGamma(Double_t /*gamma*/) { ; }
   void SetMessageConverter(CbmTrdRawToDigiR* conv = NULL) { (void) conv; }
   void SetQA(CbmTrdCheckUtil* qa = NULL) { (void) qa; }
-  void SetLabMeasurement(Bool_t set=kTRUE) {
+  void SetLabMeasurement(Bool_t set = kTRUE)
+  {
     set ? SETBIT(fConfig, kMeasurement) : CLRBIT(fConfig, kMeasurement);
     SetFeCalib(set);
   }
-  void SetFeCalib(Bool_t set = kTRUE) { set ? SETBIT(fConfig, kLab) : CLRBIT(fConfig, kLab);}
+  void SetFeCalib(Bool_t set = kTRUE) { set ? SETBIT(fConfig, kLab) : CLRBIT(fConfig, kLab); }
 
   /**
    * \brief Set the FEE type operating on the chamber
@@ -95,7 +96,7 @@ private:
    **/
   void DumpBuffer() const;
 
-  UChar_t fConfig;     ///< bit map for configuration. See class documentation
+  UChar_t fConfig;                      ///< bit map for configuration. See class documentation
   CbmTrdTrianglePRF* fTriangleBinning;  ///< Integration of PRF on triangular pad-plane geometry
   CbmTrdFASP* fFASP;                    ///< FASP simulator
   CbmTimeSlice* fTimeSlice;             ///< link to CBM time slice