diff --git a/core/data/psd/CbmPsdDsp.h b/core/data/psd/CbmPsdDsp.h
index 0e34123976786aa6699a8bf6fd6e3a43e0ded1ae..3a9f45fe1d92973ee2c0913dca9553572c692ba9 100644
--- a/core/data/psd/CbmPsdDsp.h
+++ b/core/data/psd/CbmPsdDsp.h
@@ -37,10 +37,10 @@ public:
 
   /** @brief Constructor with detailed assignment.
        **/
-  CbmPsdDsp(UInt_t address, Double_t time, Double_t ts_time, Double_t edep, UInt_t zl, Double_t accum, Double_t adc_time,
-            Double_t edep_wfm, Double_t ampl, UInt_t minimum, UInt_t time_max, std::vector<std::uint16_t> wfm,
-            Double_t fit_ampl, Double_t fit_zl, Double_t fit_edep, Double_t fit_r2, Double_t fit_time_max,
-            std::vector<std::uint16_t> fit_wfm);
+  CbmPsdDsp(UInt_t address, Double_t time, Double_t ts_time, Double_t edep, UInt_t zl, Double_t accum,
+            Double_t adc_time, Double_t edep_wfm, Double_t ampl, UInt_t minimum, UInt_t time_max,
+            std::vector<std::uint16_t> wfm, Double_t fit_ampl, Double_t fit_zl, Double_t fit_edep, Double_t fit_r2,
+            Double_t fit_time_max, std::vector<std::uint16_t> fit_wfm);
 
 
   /**  Copy constructor **/
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx
index 0a65c05f55ae11684488d526b69f9ab1557bfaf1..7c41ec29bcda0658cfbf3ceb3fe6ff6490a72b18 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx
@@ -316,7 +316,7 @@ Bool_t CbmMcbm2018UnpackerAlgoPsd::ProcessMs(const fles::Timeslice& ts, size_t u
           }
           if (ReadResult == 0) {
 
-            double prev_hit_time = 
+            double prev_hit_time =
               dMsRelativeTime + (double) PsdReader.VectPackHdr.at(0).uAdcTime * 12.5 - fdTimeOffsetNs;  //in ns
 
             //hit loop
@@ -338,8 +338,10 @@ Bool_t CbmMcbm2018UnpackerAlgoPsd::ProcessMs(const fles::Timeslice& ts, size_t u
               UInt_t uChanUId = fviPsdChUId[uHitChannel];  //unique ID
 
               UInt_t fuAddress = uChanUId;                /// Unique channel address
-              Double_t fdTime  = dMsRelativeTime + (double) PsdReader.VectPackHdr.at(hit_iter).uAdcTime * 12.5 - fdTimeOffsetNs;  /// Time of measurement relative to TS [ns]
-              Double_t fdTsTime = fdTsStartTime - fdStartTime;  /// Time of TimeSlice of measurement. Relative to first TS [ns]
+              Double_t fdTime  = dMsRelativeTime + (double) PsdReader.VectPackHdr.at(hit_iter).uAdcTime * 12.5
+                                - fdTimeOffsetNs;  /// Time of measurement relative to TS [ns]
+              Double_t fdTsTime =
+                fdTsStartTime - fdStartTime;  /// Time of TimeSlice of measurement. Relative to first TS [ns]
               Double_t fdEdep = (double) PsdReader.VectHitHdr.at(hit_iter).uSignalCharge
                                 / fUnpackPar->GetMipCalibration(uHitChannel);   /// Energy deposition from FPGA [MeV]
               UInt_t fuZL      = PsdReader.VectHitHdr.at(hit_iter).uZeroLevel;  /// ZeroLevel from waveform [adc counts]
@@ -560,7 +562,7 @@ Bool_t CbmMcbm2018UnpackerAlgoPsd::SetDspOutputPointer(std::vector<CbmPsdDsp>* c
 
 std::unique_ptr<CbmPsdDigi> CbmMcbm2018UnpackerAlgoPsd::MakeDigi(CbmPsdDsp dsp)
 {
-  std::unique_ptr<CbmPsdDigi> digi(new CbmPsdDigi( dsp.GetAddress(), dsp.GetTime(), dsp.fdFitEdep ));
+  std::unique_ptr<CbmPsdDigi> digi(new CbmPsdDigi(dsp.GetAddress(), dsp.GetTime(), dsp.fdFitEdep));
 
   return digi;
 }
diff --git a/macro/psd/build_events.cpp b/macro/psd/build_events.cpp
index a14b568835e4057dcb06fcf5db75a67acb5627fe..0b3d2783e08eefcb4d6bf15b8abb0c78daff6959 100644
--- a/macro/psd/build_events.cpp
+++ b/macro/psd/build_events.cpp
@@ -143,9 +143,10 @@ int build_events(TString inFileName, TString outFileName, int dsps_to_read = -1)
             int counter = 0;
             cout.precision(32);
             for (auto& PsdDsp : event_dsp_vect) {
-              cout << "# " << counter << " dsp_time-event_begin_time " << PsdDsp.fdTime  + dsp.fdTsTime - ev_start_time << endl;
+              cout << "# " << counter << " dsp_time-event_begin_time " << PsdDsp.fdTime + dsp.fdTsTime - ev_start_time
+                   << endl;
               cout << " prev_timestump " << prev_timestump << " timestamp " << timestump << endl;
-              cout << PsdDsp.GetSectionID() << " " << PsdDsp.fdEdep << " " << PsdDsp.fdTime + dsp.fdTsTime<< endl;
+              cout << PsdDsp.GetSectionID() << " " << PsdDsp.fdEdep << " " << PsdDsp.fdTime + dsp.fdTsTime << endl;
               counter++;
             }