diff --git a/Phys/LoKiFitters/src/ParticleClassificator.cpp b/Phys/LoKiFitters/src/ParticleClassificator.cpp
index fcc2915ad3658946d665a9d485156a1a9ba2c658..d63f95196b424301caf96d2c3027a38934a9eae2 100644
--- a/Phys/LoKiFitters/src/ParticleClassificator.cpp
+++ b/Phys/LoKiFitters/src/ParticleClassificator.cpp
@@ -175,66 +175,62 @@ StatusCode LoKi::ParticleClassificator::initialize() {
 // ========================================================================
 StatusCode LoKi::ParticleClassificator::finalize() {
   // statistics:
-  if ( msgLevel( MSG::DEBUG ) || propsPrint() ) {
-    MsgStream& log = propsPrint() ? info() : debug();
+  if ( msgLevel( MSG::DEBUG ) ) {
     if ( !m_shortLived.accepted().empty() ) {
-      log << "Short-Lived      particles : " << std::endl;
-      LHCb::ParticleProperties::printAsTable( m_shortLived.accepted(), log, m_ppSvc );
-      log << endmsg;
+      LHCb::ParticleProperties::printAsTable( m_shortLived.accepted(), debug() << "Short-Lived      particles : \n",
+                                              m_ppSvc )
+          << endmsg;
     }
     if ( !m_longLived.accepted().empty() ) {
-      log << "Long-Lived       particles : " << std::endl;
-      LHCb::ParticleProperties::printAsTable( m_longLived.accepted(), log, m_ppSvc );
-      log << endmsg;
+      LHCb::ParticleProperties::printAsTable( m_longLived.accepted(), debug() << "Long-Lived       particles : \n",
+                                              m_ppSvc )
+          << endmsg;
     }
     //
     // Gamma
     if ( !m_gamma_like.empty() ) {
-      log << "Gamma-like       particles : " << m_gammaLike << std::endl;
-      LHCb::ParticleProperties::printAsTable( m_gamma_like, log, m_ppSvc );
-      log << endmsg;
+      LHCb::ParticleProperties::printAsTable(
+          m_gamma_like, debug() << "Gamma-like       particles : " << m_gammaLike << '\n', m_ppSvc )
+          << endmsg;
     }
     // GammaC
     if ( !m_gammaC_like.empty() ) {
-      log << "Gamma-conv-like  particles : " << m_gammaCLike << std::endl;
-      LHCb::ParticleProperties::printAsTable( m_gammaC_like, log, m_ppSvc );
-      log << endmsg;
+      LHCb::ParticleProperties::printAsTable(
+          m_gammaC_like, debug() << "Gamma-conv-like  particles : " << m_gammaCLike << '\n', m_ppSvc )
+          << endmsg;
     }
     // DiGamma
     if ( !m_digamma_like.empty() ) {
-      log << "DiGamma-like     particles : " << m_digammaLike << std::endl;
-      LHCb::ParticleProperties::printAsTable( m_digamma_like, log, m_ppSvc );
-      log << endmsg;
+      LHCb::ParticleProperties::printAsTable(
+          m_digamma_like, debug() << "DiGamma-like     particles : " << m_digammaLike << '\n', m_ppSvc )
+          << endmsg;
     }
     //
     // Merged-pi0
     if ( !m_mergedPi0_like.empty() ) {
-      log << "Merged-pi0-like  particles : " << m_mergedPi0Like << std::endl;
-      LHCb::ParticleProperties::printAsTable( m_mergedPi0_like, log, m_ppSvc );
-      log << endmsg;
+      LHCb::ParticleProperties::printAsTable(
+          m_mergedPi0_like, debug() << "Merged-pi0-like  particles : " << m_mergedPi0Like << '\n', m_ppSvc )
+          << endmsg;
     }
     //
     // jets-like
     if ( !m_jets_like.empty() ) {
-      log << "Jets-like  particles : " << m_jetsLike << std::endl;
-      LHCb::ParticleProperties::printAsTable( m_jets_like, log, m_ppSvc );
-      log << endmsg;
+      LHCb::ParticleProperties::printAsTable( m_jets_like, debug() << "Jets-like  particles : " << m_jetsLike << '\n',
+                                              m_ppSvc )
+          << endmsg;
     }
     //
     // rho+-like
     if ( !m_rhoplus_like.empty() ) {
-      log << "Rho+-like  particles : " << std::endl;
-      LHCb::ParticleProperties::printAsTable( m_rhoplus_like, log, m_ppSvc );
-      log << endmsg;
+      LHCb::ParticleProperties::printAsTable( m_rhoplus_like, debug() << "Rho+-like  particles : \n", m_ppSvc )
+          << endmsg;
     }
     //
   }
   //
   if ( !m_unclassified.empty() ) {
-    MsgStream& log = warning();
-    log << "Unclassified particles : " << std::endl;
-    LHCb::ParticleProperties::printAsTable( m_unclassified, log, m_ppSvc );
-    log << endmsg;
+    warning() << "Unclassified particles : \n";
+    LHCb::ParticleProperties::printAsTable( m_unclassified, warning(), m_ppSvc ) << endmsg;
   }
   //
   // reset particle property service & functors