diff --git a/DataFormats/TrackerRecHit2D/interface/SiTrackerMultiRecHit.h b/DataFormats/TrackerRecHit2D/interface/SiTrackerMultiRecHit.h
index 20565673ef958..5e64fde8303e8 100644
--- a/DataFormats/TrackerRecHit2D/interface/SiTrackerMultiRecHit.h
+++ b/DataFormats/TrackerRecHit2D/interface/SiTrackerMultiRecHit.h
@@ -16,7 +16,8 @@ class SiTrackerMultiRecHit : public BaseTrackerRecHit
   typedef BaseTrackerRecHit Base;
   SiTrackerMultiRecHit():
     theHits(),
-    theWeights(){}
+    theWeights(),
+    annealing_(0){}
   virtual ~SiTrackerMultiRecHit(){}	
   
   
diff --git a/RecoTracker/SiTrackerMRHTools/interface/SiTrackerMultiRecHitUpdator.h b/RecoTracker/SiTrackerMRHTools/interface/SiTrackerMultiRecHitUpdator.h
index 35dba6f79ad78..b4bad7fe1c183 100644
--- a/RecoTracker/SiTrackerMRHTools/interface/SiTrackerMultiRecHitUpdator.h
+++ b/RecoTracker/SiTrackerMRHTools/interface/SiTrackerMultiRecHitUpdator.h
@@ -37,18 +37,18 @@ class SiTrackerMultiRecHitUpdator{
   
   //calls the update method in order to build a SiTrackerMultiRecHit 
   virtual TransientTrackingRecHit::RecHitPointer  buildMultiRecHit(const std::vector<const TrackingRecHit*>& rhv, 
-								   TrajectoryStateOnSurface tsos,
+								   const TrajectoryStateOnSurface& tsos,
 								   float annealing=1.) const;
   
   //updates an existing SiTrackerMultiRecHit
   //in case a different kind of rechit is passed it returns clone(tsos)
   virtual TransientTrackingRecHit::RecHitPointer  update( TransientTrackingRecHit::ConstRecHitPointer original,  
-							  TrajectoryStateOnSurface tsos,
+							  const TrajectoryStateOnSurface& tsos,
 							  double annealing=1.) const;
   
   //returns a SiTrackerMultiRecHit out of the transient components	
   TransientTrackingRecHit::RecHitPointer update( TransientTrackingRecHit::ConstRecHitContainer& tcomponents,  
-					         TrajectoryStateOnSurface tsos,
+					         const TrajectoryStateOnSurface& tsos,
 						 double annealing=1.) const;
 
   //computes weights or the cut-off value (depending on CutWeight variable)
diff --git a/RecoTracker/SiTrackerMRHTools/plugins/MultiRecHitCollectorESProducer.cc b/RecoTracker/SiTrackerMRHTools/plugins/MultiRecHitCollectorESProducer.cc
index 2d77870064ce7..c43dc61c6b9da 100644
--- a/RecoTracker/SiTrackerMRHTools/plugins/MultiRecHitCollectorESProducer.cc
+++ b/RecoTracker/SiTrackerMRHTools/plugins/MultiRecHitCollectorESProducer.cc
@@ -55,20 +55,20 @@ MultiRecHitCollectorESProducer::produce(const MultiRecHitRecord& iRecord){
 	std::string propagatorOppositeName = conf_.getParameter<std::string>("propagatorOpposite");  
 	ESHandle<Propagator>  propagatorOppositehandle;
   	iRecord.getRecord<CkfComponentsRecord>().getRecord<TrackingComponentsRecord>().get(propagatorOppositeName, propagatorOppositehandle); 
-  	_collector  = boost::shared_ptr<MultiRecHitCollector>(new GroupedDAFHitCollector(measurementhandle.product(),
+  	collector_ = boost::shared_ptr<MultiRecHitCollector>(new GroupedDAFHitCollector(measurementhandle.product(),
 									         mrhuhandle.product(),
 										 estimatorhandle.product(),
 										 propagatorhandle.product(),
 										 propagatorOppositehandle.product(), debug));
   } 
   else {
-	_collector  = boost::shared_ptr<MultiRecHitCollector>(new SimpleDAFHitCollector(measurementhandle.product(),
+	collector_ = boost::shared_ptr<MultiRecHitCollector>(new SimpleDAFHitCollector(measurementhandle.product(),
                                                                                  mrhuhandle.product(),
                                                                                  estimatorhandle.product(),
                                                                                  propagatorhandle.product(), debug));
   }
   	
-  return _collector;
+  return collector_;
 
 }
 
diff --git a/RecoTracker/SiTrackerMRHTools/plugins/MultiRecHitCollectorESProducer.h b/RecoTracker/SiTrackerMRHTools/plugins/MultiRecHitCollectorESProducer.h
index d520f19b10434..eb847da40d24a 100644
--- a/RecoTracker/SiTrackerMRHTools/plugins/MultiRecHitCollectorESProducer.h
+++ b/RecoTracker/SiTrackerMRHTools/plugins/MultiRecHitCollectorESProducer.h
@@ -26,7 +26,7 @@ class  MultiRecHitCollectorESProducer: public edm::ESProducer{
   void setConf(const edm::ParameterSet& conf){ conf_ = conf; }
  
  private:
-  boost::shared_ptr<MultiRecHitCollector> _collector;
+  boost::shared_ptr<MultiRecHitCollector> collector_;
   edm::ParameterSet conf_;
 
 };
diff --git a/RecoTracker/SiTrackerMRHTools/plugins/module.cc b/RecoTracker/SiTrackerMRHTools/plugins/module.cc
index 0aa90fb47201f..d6aa149330662 100644
--- a/RecoTracker/SiTrackerMRHTools/plugins/module.cc
+++ b/RecoTracker/SiTrackerMRHTools/plugins/module.cc
@@ -3,8 +3,6 @@
  
 #include "RecoTracker/SiTrackerMRHTools/plugins/SiTrackerMultiRecHitUpdatorESProducer.h"
 #include "RecoTracker/SiTrackerMRHTools/plugins/MultiRecHitCollectorESProducer.h"
-//#include "RecoTracker/SiTrackerMRHTools/plugins/SiTrackerMultiRecHitUpdatorMTFESProducer.h"
-//#include "RecoTracker/SiTrackerMRHTools/plugins/MultiTrackFilterCollectorESProducer.h"
  
 #include "FWCore/Framework/interface/ModuleFactory.h"
 #include "FWCore/Framework/interface/ESProducer.h"
@@ -13,5 +11,3 @@
  
 DEFINE_FWK_EVENTSETUP_MODULE(SiTrackerMultiRecHitUpdatorESProducer);
 DEFINE_FWK_EVENTSETUP_MODULE(MultiRecHitCollectorESProducer);
-//DEFINE_FWK_EVENTSETUP_MODULE(SiTrackerMultiRecHitUpdatorMTFESProducer);
-//DEFINE_FWK_EVENTSETUP_MODULE(MultiTrackFilterCollectorESProducer);
diff --git a/RecoTracker/SiTrackerMRHTools/src/GroupedDAFHitCollector.cc b/RecoTracker/SiTrackerMRHTools/src/GroupedDAFHitCollector.cc
index 8760d83a0565f..fba80bf4311a9 100644
--- a/RecoTracker/SiTrackerMRHTools/src/GroupedDAFHitCollector.cc
+++ b/RecoTracker/SiTrackerMRHTools/src/GroupedDAFHitCollector.cc
@@ -13,8 +13,6 @@
 #include <vector>
 #include <map>
 
-#define _debug_GroupedDAFHitCollector_ 
-
 using namespace std;
 
 vector<TrajectoryMeasurement> GroupedDAFHitCollector::recHits(const Trajectory& traj, 
@@ -194,7 +192,7 @@ void GroupedDAFHitCollector::buildMultiRecHits(const vector<TrajectoryMeasuremen
     }
 
     LogTrace("MultiRecHitCollector") << "The best TSOS in this group is " << state << " it lays on surface located at " << state.surface().position();
-#ifdef _debug_GroupedDAFHitCollector_	
+
     LogTrace("MultiRecHitCollector") << "For the MRH on this group the following hits will be used"; 
     for (vector<const TrackingRecHit*>::iterator iter = hits.begin(); iter != hits.end(); iter++){  
       string validity = "valid";
@@ -206,8 +204,7 @@ void GroupedDAFHitCollector::buildMultiRecHits(const vector<TrajectoryMeasuremen
 				       << " surface position " << getMeasurementTracker()->geomTracker()->idToDet((*iter)->geographicalId())->position()  
 				       << " hit local position " << (*iter)->localPosition();
     }
-#endif
-    //ERICA: Why I pass all the hits and only the TSOS of igroup->measurements().front().predictedState() 
+
     result.push_back(TrajectoryMeasurement(state,theUpdator->buildMultiRecHit(hits, state)));
   }
 	//can this happen? it means that the measgroup was not empty but no valid measurement was found inside
diff --git a/RecoTracker/SiTrackerMRHTools/src/SiTrackerMultiRecHitUpdator.cc b/RecoTracker/SiTrackerMRHTools/src/SiTrackerMultiRecHitUpdator.cc
index a9aee9d5268d3..55c41fa378383 100644
--- a/RecoTracker/SiTrackerMRHTools/src/SiTrackerMultiRecHitUpdator.cc
+++ b/RecoTracker/SiTrackerMRHTools/src/SiTrackerMultiRecHitUpdator.cc
@@ -24,7 +24,7 @@ SiTrackerMultiRecHitUpdator::SiTrackerMultiRecHitUpdator(const TransientTracking
 
 
 TransientTrackingRecHit::RecHitPointer  SiTrackerMultiRecHitUpdator::buildMultiRecHit(const std::vector<const TrackingRecHit*>& rhv,
-                                                                          	      TrajectoryStateOnSurface tsos,
+                                                                          	      const TrajectoryStateOnSurface& tsos,
  										      float annealing) const{
   LogTrace("SiTrackerMultiRecHitUpdator") << "Calling SiTrackerMultiRecHitUpdator::buildMultiRecHit with AnnealingFactor: "  << annealing;
   TransientTrackingRecHit::ConstRecHitContainer tcomponents;	
@@ -37,7 +37,7 @@ TransientTrackingRecHit::RecHitPointer  SiTrackerMultiRecHitUpdator::buildMultiR
 }
 
 TransientTrackingRecHit::RecHitPointer SiTrackerMultiRecHitUpdator::update( TransientTrackingRecHit::ConstRecHitPointer original,
-                                                                	    TrajectoryStateOnSurface tsos,
+                                                                	    const TrajectoryStateOnSurface& tsos,
 									    double annealing) const{
   LogTrace("SiTrackerMultiRecHitUpdator") << "Calling SiTrackerMultiRecHitUpdator::update with AnnealingFactor: "  << annealing;
 
@@ -61,7 +61,7 @@ TransientTrackingRecHit::RecHitPointer SiTrackerMultiRecHitUpdator::update( Tran
 
 /*------------------------------------------------------------------------------------------------------------------------*/
 TransientTrackingRecHit::RecHitPointer SiTrackerMultiRecHitUpdator::update( TransientTrackingRecHit::ConstRecHitContainer& tcomponents,
-                                                                	    TrajectoryStateOnSurface tsos,
+                                                                	    const TrajectoryStateOnSurface& tsos,
 									    double annealing) const{
 
   if (tcomponents.empty()){