Cosmetics
Some work for future integration in cmssw