diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool_Ztautau.cxx b/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool_Ztautau.cxx
index 43f68839230700d9608e0183ea0097f02587c537..cc1fbe84bbcf611c6030bf58bfe8eb7365a42d01 100644
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool_Ztautau.cxx
+++ b/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool_Ztautau.cxx
@@ -221,17 +221,11 @@ StatusCode HLTTauMonTool::RealZTauTauEfficiency(const std::string & goodTauRefTy
      //ltau_dR > 2.9         &&
      ltau_vismass > 45000. && ltau_vismass < 85000.)
     {
-      for(unsigned int i=0;i<m_trigItemsZtt.size();++i)
-	{
-	  std::string l1_chain(LowerChain("HLT_"+m_trigItemsZtt[i]));
-	  std::string hlt_chain = "HLT_"+m_trigItemsZtt[i];
-          std::string trigItemShort;
-          if(m_trigItemsZtt[i].find("tau25")!=string::npos && m_trigItemsZtt[i].find("L1TAU")!=string::npos){
-            size_t posit=m_trigItemsZtt[i].rfind("_");
-            if(posit<31)trigItemShort=m_trigItemsZtt[i].substr(0,posit);
-          }
+      for ( const auto& item: m_trigItemsZtt ) {
+	  std::string l1_chain(LowerChain("HLT_"+item));
+	  std::string hlt_chain = "HLT_"+item;
 
-	  setCurrentMonGroup("HLT/TauMon/Expert/RealZtautauEff/"+trigItemShort);
+	  setCurrentMonGroup("HLT/TauMon/Expert/RealZtautauEff/"+item);
 	  //hist("hRealZttPtDenom")->Fill(Tau_TLV.Pt()/GeV);
 
 	  //L1
diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool_bookHistograms.cxx b/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool_bookHistograms.cxx
index 044a4226892b0c70f42d92cfaaab899921e7d40e..8af3ab872d90fd6f31d4c65dff4e1785bba63d30 100644
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool_bookHistograms.cxx
+++ b/Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool_bookHistograms.cxx
@@ -611,16 +611,10 @@ void HLTTauMonTool::bookHistogramsAllItem(){
     {
         const int nbin_pt = 11;
         double bins_pt[nbin_pt] = {20.,25.,30.,35.,40.,45.,50.,60.,70.,100.,150.};
-        
-        for(unsigned int i=0;i<m_trigItemsZtt.size();++i)
+        for ( const auto& item: m_trigItemsZtt )         
           {
-            std::string trigItemShort;
-            if(m_trigItemsZtt[i].find("tau25")!=string::npos){
-              size_t posit=m_trigItemsZtt[i].rfind("_");
-              if(posit<31)trigItemShort=m_trigItemsZtt[i].substr(0,posit);
-            }
-            addMonGroup( new MonGroup(this, "HLT/TauMon/Expert/RealZtautauEff/"+trigItemShort,run) );
-            setCurrentMonGroup("HLT/TauMon/Expert/RealZtautauEff/"+trigItemShort);
+            addMonGroup( new MonGroup(this, "HLT/TauMon/Expert/RealZtautauEff/"+item,run) );
+            setCurrentMonGroup("HLT/TauMon/Expert/RealZtautauEff/"+item);
             //addHistogram(new TH1F("hRealZttPtDenom","Offline Real Tau;Offline Tau p_{T} [GeV];",nbin_pt-1,bins_pt));
             //addHistogram(new TH1F("hRealZttL1PtNum","L1 vs Offline Real Tau; Offline Tau p_{T} [GeV];",nbin_pt-1,bins_pt));
             //addHistogram(new TH1F("hRealZttHLTPtNum","HLT vs Offline Real Tau; Offline Tau p_{T} [GeV];",nbin_pt-1,bins_pt));