update on "consumes" for RecoMET and clean up code

update on "consumes" for RecoMET
start using edm::ConsumesCollector as suggested at https://github.com/cms-sw/cmssw/pull/904
clean up code a bit