diff --git a/DataFormats/FWLite/test/chainevent_looping_cint.C b/DataFormats/FWLite/test/chainevent_looping_cint.C
index 68c1a1db4cf..bf8c8896585 100644
--- a/DataFormats/FWLite/test/chainevent_looping_cint.C
+++ b/DataFormats/FWLite/test/chainevent_looping_cint.C
@@ -4,11 +4,11 @@ using namespace std;
 
 #if defined(__CINT__) && !defined(__MAKECINT__)
 class loadFWLite {
-   public:
-      loadFWLite() {
-         gSystem->Load("libFWCoreFWLite");
-         FWLiteEnabler::enable();
-      }
+public:
+  loadFWLite() {
+    gSystem->Load("libFWCoreFWLite");
+    FWLiteEnabler::enable();
+  }
 };
 
 static loadFWLite lfw;
@@ -20,93 +20,93 @@ static loadFWLite lfw;
 #include "DataFormats/TestObjects/interface/ThingCollection.h"
 #endif
 
-int chainevent_looping_cint()
-{
-vector<string>  files;
-files.push_back("empty_a.root");
-files.push_back("good_a.root");
-files.push_back("empty_a.root");
-files.push_back("good_b.root");
-files.push_back("empty_a.root");
-fwlite::ChainEvent e(files);
+int chainevent_looping_cint() {
+  vector<string> files;
+  files.push_back("empty_a.root");
+  files.push_back("good_a.root");
+  files.push_back("empty_a.root");
+  files.push_back("good_b.root");
+  files.push_back("empty_a.root");
+  fwlite::ChainEvent e(files);
+
+  int i = 0;
+  int returnValue = 0;
+  TFile* f = 0;
 
-int i =0;
-int returnValue = 0;
-TFile* f = 0;
+  for (; e.isValid(); ++e, ++i) {
+    if (e.getTFile() != f) {
+      f = e.getTFile();
+      cout << "New file " << f->GetName() << endl;
+    }
 
-for( ;e.isValid();++e,++i) {
-  if (e.getTFile() != f) {
-    f = e.getTFile();
-    cout << "New file " << f->GetName() << endl;
+    fwlite::Handle<vector<edmtest::Thing> > pThing;
+    //pThing.getByLabel(e,"Thing","","TEST"); //WORKS
+    pThing.getByLabel(e, "Thing");
+
+    for (i = 0; i != pThing.ref().size(); ++i) {
+      cout << pThing.ref().at(i).a << " ";
+    }
+    cout << endl;
   }
+  if (i == 0) {
+    cout << "First loop failed!" << endl;
+    returnValue = 1;
+  }
+  e.toBegin();
 
-  fwlite::Handle<vector<edmtest::Thing> > pThing;
-  //pThing.getByLabel(e,"Thing","","TEST"); //WORKS
-  pThing.getByLabel(e,"Thing");
-  
-  for(i=0; i!=pThing.ref().size();++i) {
-    cout <<pThing.ref().at(i).a<<" ";
+  i = 0;
+  for (; e; ++e, ++i) {
   }
-  cout << endl;
-}  
-if (i==0) {
-  cout <<"First loop failed!"<<endl;
-  returnValue = 1;
-}
-e.toBegin();
 
-i=0;
-for( ;e;++e,++i) { 
-}
+  if (i == 0) {
+    cout << "Second loop failed!" << endl;
+    returnValue = 1;
+  }
 
-if (i==0) {
-  cout <<"Second loop failed!"<<endl;
-  returnValue = 1;
-}
+  i = 0;
+  for (e.toBegin(); !e.atEnd(); ++e, ++i) {
+    fwlite::Handle<vector<edmtest::Thing> > pThing;
+    //pThing.getByLabel(e,"Thing","","TEST"); //WORKS
+    pThing.getByLabel(e, "Thing");
 
-i=0;
-for(e.toBegin(); !e.atEnd();++e,++i) {
-   fwlite::Handle<vector<edmtest::Thing> > pThing;
-   //pThing.getByLabel(e,"Thing","","TEST"); //WORKS
-   pThing.getByLabel(e,"Thing");
-   
-   for(i=0; i!=pThing.ref().size();++i) {
-      cout <<pThing.ref().at(i).a<<" ";
-   }
-   cout << endl;
-   //DOES NOT WORK in CINT
-   //for(vector<edmtest::Thing>::const_iterator it = pThing.data()->begin(); it != pThing.data()->end();++it) {
-   //   cout <<(*it).a<<endl;
-   //}
-}
-if (i==0) {
-  cout <<"Third loop failed!"<<endl;
-  returnValue = 1;
-}
-e.to(0);
-for (int j = 0; j<20; ++j) {
-  int k = rand() % 10;
-  if(e.to(k)) {
-    edm::EventID id = e.id();
-    cout << "Entry " << k << " Run " << id.run() << " event " << id.event() << endl;
-  } else {
-    cout <<"Entry "<<k<<" is not valid"<<endl;
+    for (i = 0; i != pThing.ref().size(); ++i) {
+      cout << pThing.ref().at(i).a << " ";
+    }
+    cout << endl;
+    //DOES NOT WORK in CINT
+    //for(vector<edmtest::Thing>::const_iterator it = pThing.data()->begin(); it != pThing.data()->end();++it) {
+    //   cout <<(*it).a<<endl;
+    //}
+  }
+  if (i == 0) {
+    cout << "Third loop failed!" << endl;
+    returnValue = 1;
+  }
+  e.to(0);
+  for (int j = 0; j < 20; ++j) {
+    int k = rand() % 10;
+    if (e.to(k)) {
+      edm::EventID id = e.id();
+      cout << "Entry " << k << " Run " << id.run() << " event " << id.event() << endl;
+    } else {
+      cout << "Entry " << k << " is not valid" << endl;
+    }
   }
-}
 
   e.to(0);
   long size = e.size();
   edm::EventID last;
-  for (long l = 0; l<size; ++l) {
+  for (long l = 0; l < size; ++l) {
     e.to(l);
     edm::EventID id = e.id();
     cout << "Entry " << l << " Run " << id.run() << " event " << id.event() << endl;
-    if(last == id) {
+    if (last == id) {
       returnValue = 1;
-      cout <<"duplicate event ("<<id.run()<<","<<id.event()<<") seen at index "<<l<<" while testing 'to'"<<endl;
+      cout << "duplicate event (" << id.run() << "," << id.event() << ") seen at index " << l << " while testing 'to'"
+           << endl;
       break;
     }
   }
 
-return returnValue;
+  return returnValue;
 }
diff --git a/DataFormats/FWLite/test/event_looping_cint.C b/DataFormats/FWLite/test/event_looping_cint.C
index 0237d3c3c5d..b886e513929 100644
--- a/DataFormats/FWLite/test/event_looping_cint.C
+++ b/DataFormats/FWLite/test/event_looping_cint.C
@@ -4,11 +4,11 @@ using namespace std;
 
 #if defined(__CINT__) && !defined(__MAKECINT__)
 class loadFWLite {
-   public:
-      loadFWLite() {
-         gSystem->Load("libFWCoreFWLite");
-         FWLiteEnabler::enable();
-      }
+public:
+  loadFWLite() {
+    gSystem->Load("libFWCoreFWLite");
+    FWLiteEnabler::enable();
+  }
 };
 
 static loadFWLite lfw;
@@ -20,57 +20,56 @@ static loadFWLite lfw;
 #include "DataFormats/TestObjects/interface/ThingCollection.h"
 #endif
 
-int event_looping_cint()
-{
-TFile f("good_a.root");
-fwlite::Event e(&f);
+int event_looping_cint() {
+  TFile f("good_a.root");
+  fwlite::Event e(&f);
+
+  int i = 0;
+  int returnValue = 0;
+  for (; e.isValid(); ++e, ++i) {
+    fwlite::Handle<vector<edmtest::Thing> > pThing;
+    //pThing.getByLabel(e,"Thing","","TEST"); //WORKS
+    pThing.getByLabel(e, "Thing");
 
-int i =0;
-int returnValue = 0;
-for( ;e.isValid();++e,++i) {
-  fwlite::Handle<vector<edmtest::Thing> > pThing;
-  //pThing.getByLabel(e,"Thing","","TEST"); //WORKS
-  pThing.getByLabel(e,"Thing");
-  
-  for(int i=0; i!=pThing.ref().size();++i) {
-    cout <<pThing.ref().at(i).a<< " ";
+    for (int i = 0; i != pThing.ref().size(); ++i) {
+      cout << pThing.ref().at(i).a << " ";
+    }
+    cout << endl;
   }
-  cout << endl;
-}  
-if (i==0) {
-  cout <<"First loop failed!"<<endl;
-  returnValue = 1;
-}
-e.toBegin();
+  if (i == 0) {
+    cout << "First loop failed!" << endl;
+    returnValue = 1;
+  }
+  e.toBegin();
 
-i=0;
-for( ;e;++e,++i) { 
-}
+  i = 0;
+  for (; e; ++e, ++i) {
+  }
 
-if (i==0) {
-  cout <<"Second loop failed!"<<endl;
-  returnValue = 1;
-}
+  if (i == 0) {
+    cout << "Second loop failed!" << endl;
+    returnValue = 1;
+  }
 
-i=0;
-for(e.toBegin(); !e.atEnd();++e,++i) {
-   fwlite::Handle<vector<edmtest::Thing> > pThing;
-   //pThing.getByLabel(e,"Thing","","TEST"); //WORKS
-   pThing.getByLabel(e,"Thing");
-   
-   for(int i=0; i!=pThing.ref().size();++i) {
-      cout <<pThing.ref().at(i).a<<" ";
-   }
-   cout << endl;
+  i = 0;
+  for (e.toBegin(); !e.atEnd(); ++e, ++i) {
+    fwlite::Handle<vector<edmtest::Thing> > pThing;
+    //pThing.getByLabel(e,"Thing","","TEST"); //WORKS
+    pThing.getByLabel(e, "Thing");
 
-   //DOES NOT WORK
-   //for(vector<edmtest::Thing>::const_iterator it = pThing.data()->begin(); it != pThing.data()->end();++it) {
-   //   cout <<(*it).a<<endl;
-   //}
-}
-if (i==0) {
-  cout <<"Third loop failed!"<<endl;
-  returnValue = 1;
-}
-return returnValue;
+    for (int i = 0; i != pThing.ref().size(); ++i) {
+      cout << pThing.ref().at(i).a << " ";
+    }
+    cout << endl;
+
+    //DOES NOT WORK
+    //for(vector<edmtest::Thing>::const_iterator it = pThing.data()->begin(); it != pThing.data()->end();++it) {
+    //   cout <<(*it).a<<endl;
+    //}
+  }
+  if (i == 0) {
+    cout << "Third loop failed!" << endl;
+    returnValue = 1;
+  }
+  return returnValue;
 }
diff --git a/DataFormats/FWLite/test/runlumi_looping_cint.C b/DataFormats/FWLite/test/runlumi_looping_cint.C
index 8d41d6f0ade..5a6930540d2 100644
--- a/DataFormats/FWLite/test/runlumi_looping_cint.C
+++ b/DataFormats/FWLite/test/runlumi_looping_cint.C
@@ -4,11 +4,11 @@ using namespace std;
 
 #if defined(__CINT__) && !defined(__MAKECINT__)
 class loadFWLite {
-   public:
-      loadFWLite() {
-         gSystem->Load("libFWCoreFWLite");
-         FWLiteEnabler::enable();
-      }
+public:
+  loadFWLite() {
+    gSystem->Load("libFWCoreFWLite");
+    FWLiteEnabler::enable();
+  }
 };
 
 static loadFWLite lfw;
@@ -20,96 +20,94 @@ static loadFWLite lfw;
 #include "DataFormats/TestObjects/interface/ThingCollection.h"
 #endif
 
-int runlumi_looping_cint()
-{
-    TFile f("prodmerge.root");
-    fwlite::Run r(&f);
-    fwlite::LuminosityBlock l(&f);
-
-    int i =0;
-    int returnValue = 0;
-    for( ;r.isValid();++r,++i) {
-        cout << r.run() << endl;
-        fwlite::Handle<vector<edmtest::Thing> > pThing;
-        pThing.getByLabel(r,"Thing","beginRun");
-   
-        for(int i=0; i!=pThing.ref().size();++i) {
-            cout <<pThing.ref().at(i).a<<" ";
-        }
-        cout << endl;
-    }  
-    if (i==0) {
-        cout <<"First run loop failed!"<<endl;
-        returnValue = 1;
-    }
+int runlumi_looping_cint() {
+  TFile f("prodmerge.root");
+  fwlite::Run r(&f);
+  fwlite::LuminosityBlock l(&f);
+
+  int i = 0;
+  int returnValue = 0;
+  for (; r.isValid(); ++r, ++i) {
+    cout << r.run() << endl;
+    fwlite::Handle<vector<edmtest::Thing> > pThing;
+    pThing.getByLabel(r, "Thing", "beginRun");
 
-    i =0;
-    returnValue = 0;
-    for( ;l.isValid();++l,++i) {
-        cout << l.id().run() << " " << l.id().luminosityBlock() << endl;
-        fwlite::Handle<vector<edmtest::Thing> > pThing;
-        pThing.getByLabel(l,"Thing","beginLumi");
-   
-        for(int i=0; i!=pThing.ref().size();++i) {
-            cout <<pThing.ref().at(i).a<<" ";
-        }
-        cout << endl;
-    }  
-    if (i==0) {
-        cout <<"First lumi loop failed!"<<endl;
-        returnValue = 1;
+    for (int i = 0; i != pThing.ref().size(); ++i) {
+      cout << pThing.ref().at(i).a << " ";
     }
+    cout << endl;
+  }
+  if (i == 0) {
+    cout << "First run loop failed!" << endl;
+    returnValue = 1;
+  }
 
+  i = 0;
+  returnValue = 0;
+  for (; l.isValid(); ++l, ++i) {
+    cout << l.id().run() << " " << l.id().luminosityBlock() << endl;
+    fwlite::Handle<vector<edmtest::Thing> > pThing;
+    pThing.getByLabel(l, "Thing", "beginLumi");
 
-    r.toBegin();
-    i=0;
-    for( ;r;++r,++i) { 
-    }
-    if (i==0) {
-        cout <<"Second run loop failed!"<<endl;
-        returnValue = 1;
+    for (int i = 0; i != pThing.ref().size(); ++i) {
+      cout << pThing.ref().at(i).a << " ";
     }
+    cout << endl;
+  }
+  if (i == 0) {
+    cout << "First lumi loop failed!" << endl;
+    returnValue = 1;
+  }
 
-    l.toBegin();
-    i=0;
-    for( ;l;++l,++i) { 
-    }
-    if (i==0) {
-        cout <<"Second lumi loop failed!"<<endl;
-        returnValue = 1;
-    }
+  r.toBegin();
+  i = 0;
+  for (; r; ++r, ++i) {
+  }
+  if (i == 0) {
+    cout << "Second run loop failed!" << endl;
+    returnValue = 1;
+  }
 
-    i=0;
-    for(r.toBegin(); !r.atEnd();++r,++i) {
-        cout << r.run() << endl;
-        fwlite::Handle<vector<edmtest::Thing> > pThing;
-        pThing.getByLabel(r,"Thing","endRun");
-   
-        for(int i=0; i!=pThing.ref().size();++i) {
-            cout <<pThing.ref().at(i).a<<" ";
-        }
-        cout << endl;
-    }
-    if (i==0) {
-        cout <<"Third run loop failed!"<<endl;
-        returnValue = 1;
-    }
+  l.toBegin();
+  i = 0;
+  for (; l; ++l, ++i) {
+  }
+  if (i == 0) {
+    cout << "Second lumi loop failed!" << endl;
+    returnValue = 1;
+  }
+
+  i = 0;
+  for (r.toBegin(); !r.atEnd(); ++r, ++i) {
+    cout << r.run() << endl;
+    fwlite::Handle<vector<edmtest::Thing> > pThing;
+    pThing.getByLabel(r, "Thing", "endRun");
 
-    i=0;
-    for(l.toBegin(); !l.atEnd();++l,++i) {
-        cout << l.id().run() << " " << l.id().luminosityBlock() << endl;
-        fwlite::Handle<vector<edmtest::Thing> > pThing;
-        pThing.getByLabel(l,"Thing","endLumi");
-   
-        for(int i=0; i!=pThing.ref().size();++i) {
-            cout <<pThing.ref().at(i).a<<" ";
-        }
-        cout << endl;
+    for (int i = 0; i != pThing.ref().size(); ++i) {
+      cout << pThing.ref().at(i).a << " ";
     }
-    if (i==0) {
-        cout <<"Third lumi loop failed!"<<endl;
-        returnValue = 1;
+    cout << endl;
+  }
+  if (i == 0) {
+    cout << "Third run loop failed!" << endl;
+    returnValue = 1;
+  }
+
+  i = 0;
+  for (l.toBegin(); !l.atEnd(); ++l, ++i) {
+    cout << l.id().run() << " " << l.id().luminosityBlock() << endl;
+    fwlite::Handle<vector<edmtest::Thing> > pThing;
+    pThing.getByLabel(l, "Thing", "endLumi");
+
+    for (int i = 0; i != pThing.ref().size(); ++i) {
+      cout << pThing.ref().at(i).a << " ";
     }
+    cout << endl;
+  }
+  if (i == 0) {
+    cout << "Third lumi loop failed!" << endl;
+    returnValue = 1;
+  }
 
-    return returnValue;
+  return returnValue;
 }
diff --git a/DataFormats/FWLite/test/triggernames_cint.C b/DataFormats/FWLite/test/triggernames_cint.C
index 89e3c66f96b..ce09fe38c52 100644
--- a/DataFormats/FWLite/test/triggernames_cint.C
+++ b/DataFormats/FWLite/test/triggernames_cint.C
@@ -1,10 +1,10 @@
 #if defined(__CINT__) && !defined(__MAKECINT__)
 class loadFWLite {
-  public:
-    loadFWLite() {
-      gSystem->Load("libFWCoreFWLite");
-      FWLiteEnabler::enable();
-    }
+public:
+  loadFWLite() {
+    gSystem->Load("libFWCoreFWLite");
+    FWLiteEnabler::enable();
+  }
 };
 
 static loadFWLite lfw;
@@ -16,8 +16,7 @@ static loadFWLite lfw;
 #include <vector>
 #include <iostream>
 
-int triggernames_cint()
-{
+int triggernames_cint() {
   // TFile f1("prodmerge.root");
   // fwlite::Event ev(&f1);
 
@@ -26,12 +25,12 @@ int triggernames_cint()
   fwlite::ChainEvent ev(files);
 
   fwlite::Handle<edm::TriggerResults> hTriggerResults;
-  
+
   int iEvent = 0;
-  for (ev.toBegin(); ! ev.atEnd(); ++ev) {
+  for (ev.toBegin(); !ev.atEnd(); ++ev) {
     ++iEvent;
-    hTriggerResults.getByLabel(ev,"TriggerResults","","TEST");
-    edm::TriggerNames const&  triggerNames = ev.triggerNames(*hTriggerResults);
+    hTriggerResults.getByLabel(ev, "TriggerResults", "", "TEST");
+    edm::TriggerNames const& triggerNames = ev.triggerNames(*hTriggerResults);
 
     std::vector<std::string> const& names = triggerNames.triggerNames();
     for (unsigned i = 0; i < triggerNames.size(); ++i) {
@@ -43,18 +42,12 @@ int triggernames_cint()
     std::cout << "index for p2 = " << triggerNames.triggerIndex("p2") << std::endl;
 
     if (iEvent == 1) {
-      if (triggerNames.size() != 3U ||
-          names[0] != "p" ||
-          names[1] != "p1" ||
-          names[2] != "p2" ||
-          triggerNames.triggerName(0) != "p" ||
-          triggerNames.triggerName(1) != "p1" ||
-          triggerNames.triggerName(2) != "p2" ||
-          triggerNames.triggerIndex("p") != 0 ||
-          triggerNames.triggerIndex("p1") != 1 ||
-          triggerNames.triggerIndex("p2") != 2) {
-	std::cout << "Trigger names do match expected values\n";
-	std::cout << "In script triggernames_cint.C\n";
+      if (triggerNames.size() != 3U || names[0] != "p" || names[1] != "p1" || names[2] != "p2" ||
+          triggerNames.triggerName(0) != "p" || triggerNames.triggerName(1) != "p1" ||
+          triggerNames.triggerName(2) != "p2" || triggerNames.triggerIndex("p") != 0 ||
+          triggerNames.triggerIndex("p1") != 1 || triggerNames.triggerIndex("p2") != 2) {
+        std::cout << "Trigger names do match expected values\n";
+        std::cout << "In script triggernames_cint.C\n";
         return 1;
       }
     }
diff --git a/DataFormats/FWLite/test/triggernames_multi_cint.C b/DataFormats/FWLite/test/triggernames_multi_cint.C
index 80d9a165306..696af4f01a8 100644
--- a/DataFormats/FWLite/test/triggernames_multi_cint.C
+++ b/DataFormats/FWLite/test/triggernames_multi_cint.C
@@ -1,10 +1,10 @@
 #if defined(__CINT__) && !defined(__MAKECINT__)
 class loadFWLite {
-  public:
-    loadFWLite() {
-      gSystem->Load("libFWCoreFWLite");
-      FWLiteEnabler::enable();
-    }
+public:
+  loadFWLite() {
+    gSystem->Load("libFWCoreFWLite");
+    FWLiteEnabler::enable();
+  }
 };
 
 static loadFWLite lfw;
@@ -16,8 +16,7 @@ static loadFWLite lfw;
 #include <vector>
 #include <iostream>
 
-int triggernames_multi_cint()
-{
+int triggernames_multi_cint() {
   std::vector<std::string> files1;
   files1.push_back(std::string("prodmerge.root"));
 
@@ -27,12 +26,12 @@ int triggernames_multi_cint()
 
   fwlite::MultiChainEvent ev(files1, files2);
   fwlite::Handle<edm::TriggerResults> hTriggerResults;
-  
+
   int iEvent = 0;
-  for (ev.toBegin(); ! ev.atEnd(); ++ev) {
+  for (ev.toBegin(); !ev.atEnd(); ++ev) {
     ++iEvent;
-    hTriggerResults.getByLabel(ev,"TriggerResults","","TEST");
-    edm::TriggerNames const&  triggerNames = ev.triggerNames(*hTriggerResults);
+    hTriggerResults.getByLabel(ev, "TriggerResults", "", "TEST");
+    edm::TriggerNames const& triggerNames = ev.triggerNames(*hTriggerResults);
 
     std::vector<std::string> const& names = triggerNames.triggerNames();
     for (unsigned i = 0; i < triggerNames.size(); ++i) {
@@ -44,18 +43,12 @@ int triggernames_multi_cint()
     std::cout << "index for p2 = " << triggerNames.triggerIndex("p2") << std::endl;
 
     if (iEvent == 1) {
-      if (triggerNames.size() != 3U ||
-          names[0] != "p" ||
-          names[1] != "p1" ||
-          names[2] != "p2" ||
-          triggerNames.triggerName(0) != "p" ||
-          triggerNames.triggerName(1) != "p1" ||
-          triggerNames.triggerName(2) != "p2" ||
-          triggerNames.triggerIndex("p") != 0 ||
-          triggerNames.triggerIndex("p1") != 1 ||
-          triggerNames.triggerIndex("p2") != 2) {
-	std::cout << "Trigger names do match expected values\n";
-	std::cout << "In script triggernames_multi_cint.C\n";
+      if (triggerNames.size() != 3U || names[0] != "p" || names[1] != "p1" || names[2] != "p2" ||
+          triggerNames.triggerName(0) != "p" || triggerNames.triggerName(1) != "p1" ||
+          triggerNames.triggerName(2) != "p2" || triggerNames.triggerIndex("p") != 0 ||
+          triggerNames.triggerIndex("p1") != 1 || triggerNames.triggerIndex("p2") != 2) {
+        std::cout << "Trigger names do match expected values\n";
+        std::cout << "In script triggernames_multi_cint.C\n";
         return 1;
       }
     }