diff --git a/RecoParticleFlow/PFProducer/interface/PFAlgo.h b/RecoParticleFlow/PFProducer/interface/PFAlgo.h
index 317031645c8c0..6fb11cee79493 100644
--- a/RecoParticleFlow/PFProducer/interface/PFAlgo.h
+++ b/RecoParticleFlow/PFProducer/interface/PFAlgo.h
@@ -84,8 +84,7 @@ class PFAlgo {
                             const edm::ValueMap<reco::GsfElectronRef>& valueMapGedElectrons,
                             const edm::ValueMap<reco::PhotonRef>& valueMapGedPhotons);
 
-  void setPostHFCleaningParameters(bool postHFCleaning,
-				   const edm::ParameterSet& pfHFCleaningParams);
+  void setPostHFCleaningParameters(bool postHFCleaning, const edm::ParameterSet& pfHFCleaningParams);
 
   void setDisplacedVerticesParameters(bool rejectTracks_Bad,
                                       bool rejectTracks_Step45,
diff --git a/RecoParticleFlow/PFProducer/plugins/PFProducer.cc b/RecoParticleFlow/PFProducer/plugins/PFProducer.cc
index de4c59055d93e..bc032cef2d173 100644
--- a/RecoParticleFlow/PFProducer/plugins/PFProducer.cc
+++ b/RecoParticleFlow/PFProducer/plugins/PFProducer.cc
@@ -181,7 +181,7 @@ PFProducer::PFProducer(const edm::ParameterSet& iConfig)
   // EGamma filters
   pfAlgo_.setEGammaParameters(use_EGammaFilters_, useProtectionsForJetMET);
 
-  if (use_EGammaFilters_){
+  if (use_EGammaFilters_) {
     const edm::ParameterSet pfEGammaFilterParams = iConfig.getParameter<edm::ParameterSet>("PFEGammaFilterParameters");
     pfegamma_ = std::make_unique<PFEGammaFilters>(pfEGammaFilterParams);
   }
@@ -198,7 +198,7 @@ PFProducer::PFProducer(const edm::ParameterSet& iConfig)
   const edm::ParameterSet pfHFCleaningParams = iConfig.getParameter<edm::ParameterSet>("PFHFCleaningParameters");
 
   // Set post HF cleaning muon parameters
-  pfAlgo_.setPostHFCleaningParameters(postHFCleaning_,pfHFCleaningParams);
+  pfAlgo_.setPostHFCleaningParameters(postHFCleaning_, pfHFCleaningParams);
 
   // Input tags for HF cleaned rechits
   std::vector<edm::InputTag> tags = iConfig.getParameter<std::vector<edm::InputTag>>("cleanedHF");
diff --git a/RecoParticleFlow/PFProducer/plugins/importers/GeneralTracksImporter.cc b/RecoParticleFlow/PFProducer/plugins/importers/GeneralTracksImporter.cc
index f21e15712f153..d6cf4aa5114c0 100644
--- a/RecoParticleFlow/PFProducer/plugins/importers/GeneralTracksImporter.cc
+++ b/RecoParticleFlow/PFProducer/plugins/importers/GeneralTracksImporter.cc
@@ -21,8 +21,9 @@ class GeneralTracksImporter : public BlockElementImporterBase {
         cleanBadConvBrems_(
             conf.existsAs<bool>("cleanBadConvertedBrems") ? conf.getParameter<bool>("cleanBadConvertedBrems") : false),
         debug_(conf.getUntrackedParameter<bool>("debug", false)) {
-    bool postMuonCleaning = conf.existsAs<bool>("postMuonCleaning") ? conf.getParameter<bool>("postMuonCleaning") : false;
-    pfmu_ = std::unique_ptr<PFMuonAlgo>(new PFMuonAlgo(conf,postMuonCleaning));
+    bool postMuonCleaning =
+        conf.existsAs<bool>("postMuonCleaning") ? conf.getParameter<bool>("postMuonCleaning") : false;
+    pfmu_ = std::unique_ptr<PFMuonAlgo>(new PFMuonAlgo(conf, postMuonCleaning));
   }
 
   void importToBlock(const edm::Event&, ElementList&) const override;
diff --git a/RecoParticleFlow/PFProducer/plugins/importers/GeneralTracksImporterWithVeto.cc b/RecoParticleFlow/PFProducer/plugins/importers/GeneralTracksImporterWithVeto.cc
index af950161f47a5..b0106e434353a 100644
--- a/RecoParticleFlow/PFProducer/plugins/importers/GeneralTracksImporterWithVeto.cc
+++ b/RecoParticleFlow/PFProducer/plugins/importers/GeneralTracksImporterWithVeto.cc
@@ -22,8 +22,9 @@ class GeneralTracksImporterWithVeto : public BlockElementImporterBase {
         cleanBadConvBrems_(
             conf.existsAs<bool>("cleanBadConvertedBrems") ? conf.getParameter<bool>("cleanBadConvertedBrems") : false),
         debug_(conf.getUntrackedParameter<bool>("debug", false)) {
-    bool postMuonCleaning = conf.existsAs<bool>("postMuonCleaning") ? conf.getParameter<bool>("postMuonCleaning") : false;
-    pfmu_ = std::unique_ptr<PFMuonAlgo>(new PFMuonAlgo(conf,postMuonCleaning));
+    bool postMuonCleaning =
+        conf.existsAs<bool>("postMuonCleaning") ? conf.getParameter<bool>("postMuonCleaning") : false;
+    pfmu_ = std::unique_ptr<PFMuonAlgo>(new PFMuonAlgo(conf, postMuonCleaning));
   }
 
   void importToBlock(const edm::Event&, ElementList&) const override;
diff --git a/RecoParticleFlow/PFProducer/src/PFAlgo.cc b/RecoParticleFlow/PFProducer/src/PFAlgo.cc
index 710499ea2e1fe..f263a43732c21 100644
--- a/RecoParticleFlow/PFProducer/src/PFAlgo.cc
+++ b/RecoParticleFlow/PFProducer/src/PFAlgo.cc
@@ -23,10 +23,9 @@ PFAlgo::PFAlgo(double nSigmaECAL,
       calibration_(calibration),
       thepfEnergyCalibrationHF_(thepfEnergyCalibrationHF),
       connector_() {
-
   const edm::ParameterSet pfMuonAlgoParams = pset.getParameter<edm::ParameterSet>("PFMuonAlgoParameters");
   bool postMuonCleaning = pset.existsAs<bool>("postMuonCleaning") ? pset.getParameter<bool>("postMuonCleaning") : false;
-  pfmu_ = std::make_unique<PFMuonAlgo>(pfMuonAlgoParams,postMuonCleaning);
+  pfmu_ = std::make_unique<PFMuonAlgo>(pfMuonAlgoParams, postMuonCleaning);
 
   // Muon parameters
   muonHCAL_ = pset.getParameter<std::vector<double>>("muon_HCAL");
@@ -39,7 +38,8 @@ PFAlgo::PFAlgo(double nSigmaECAL,
   assert(factors45_.size() == 2);
 
   // Bad Hcal Track Parameters
-  const edm::ParameterSet PFBadHcalMitigationParams = pset.getParameter<edm::ParameterSet>("PFBadHcalMitigationParameters");
+  const edm::ParameterSet PFBadHcalMitigationParams =
+      pset.getParameter<edm::ParameterSet>("PFBadHcalMitigationParameters");
   goodTrackDeadHcal_ptErrRel_ = PFBadHcalMitigationParams.getParameter<double>("goodTrackDeadHcal_ptErrRel");
   goodTrackDeadHcal_chi2n_ = PFBadHcalMitigationParams.getParameter<double>("goodTrackDeadHcal_chi2n");
   goodTrackDeadHcal_layers_ = PFBadHcalMitigationParams.getParameter<uint32_t>("goodTrackDeadHcal_layers");
@@ -50,8 +50,10 @@ PFAlgo::PFAlgo(double nSigmaECAL,
   goodPixelTrackDeadHcal_maxPt_ = PFBadHcalMitigationParams.getParameter<double>("goodPixelTrackDeadHcal_maxPt");
   goodPixelTrackDeadHcal_ptErrRel_ = PFBadHcalMitigationParams.getParameter<double>("goodPixelTrackDeadHcal_ptErrRel");
   goodPixelTrackDeadHcal_chi2n_ = PFBadHcalMitigationParams.getParameter<double>("goodPixelTrackDeadHcal_chi2n");
-  goodPixelTrackDeadHcal_maxLost3Hit_ = PFBadHcalMitigationParams.getParameter<int32_t>("goodPixelTrackDeadHcal_maxLost3Hit");
-  goodPixelTrackDeadHcal_maxLost4Hit_ = PFBadHcalMitigationParams.getParameter<int32_t>("goodPixelTrackDeadHcal_maxLost4Hit");
+  goodPixelTrackDeadHcal_maxLost3Hit_ =
+      PFBadHcalMitigationParams.getParameter<int32_t>("goodPixelTrackDeadHcal_maxLost3Hit");
+  goodPixelTrackDeadHcal_maxLost4Hit_ =
+      PFBadHcalMitigationParams.getParameter<int32_t>("goodPixelTrackDeadHcal_maxLost4Hit");
   goodPixelTrackDeadHcal_dxy_ = PFBadHcalMitigationParams.getParameter<double>("goodPixelTrackDeadHcal_dxy");
   goodPixelTrackDeadHcal_dz_ = PFBadHcalMitigationParams.getParameter<double>("goodPixelTrackDeadHcal_dz");
 }
@@ -848,7 +850,6 @@ void PFAlgo::elementLoop(const reco::PFBlock& block,
                          const reco::PFBlockRef& blockref,
                          ElementIndices& inds,
                          std::vector<bool>& deadArea) {
-
   // --------------- loop 1 ------------------
 
   // The primary goal is to deal with tracks that are: