diff --git a/DQM/L1TMonitor/src/L1TStage2CaloLayer1.cc b/DQM/L1TMonitor/src/L1TStage2CaloLayer1.cc
index 126574cec5283..208e08a02f445 100644
--- a/DQM/L1TMonitor/src/L1TStage2CaloLayer1.cc
+++ b/DQM/L1TMonitor/src/L1TStage2CaloLayer1.cc
@@ -112,14 +112,14 @@ void L1TStage2CaloLayer1::dqmAnalyze(const edm::Event& event,
           for (int j = 0; j < 6; j++) {
             FED1354_slot7_bits[j] = amcPtr[j + 6] & 0xFFFFFFFF;
           }
-        }
-        else if (iFed == 1356 && daqData.nAMCs() == 7 && i == 3 && amcData.amcNo() == 7 && ((amcPtr[5] >> 14) & 0x1) == 1) {
+        } else if (iFed == 1356 && daqData.nAMCs() == 7 && i == 3 && amcData.amcNo() == 7 &&
+                   ((amcPtr[5] >> 14) & 0x1) == 1) {
           card7flag1356 = true;
           for (int j = 0; j < 6; j++) {
             FED1356_slot7_bits[j] = amcPtr[j + 6] & 0xFFFFFFFF;
           }
-        }
-        else if (iFed == 1358 && daqData.nAMCs() == 7 && i == 3 && amcData.amcNo() == 7 && ((amcPtr[5] >> 14) & 0x1) == 1) {
+        } else if (iFed == 1358 && daqData.nAMCs() == 7 && i == 3 && amcData.amcNo() == 7 &&
+                   ((amcPtr[5] >> 14) & 0x1) == 1) {
           card7flag1358 = true;
           for (int j = 0; j < 6; j++) {
             FED1358_slot7_bits[j] = amcPtr[j + 6] & 0xFFFFFFFF;
diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloLayer1Unpacker.cc b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloLayer1Unpacker.cc
index 1eca5d52b2902..b6db1f57f4ce5 100644
--- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloLayer1Unpacker.cc
+++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloLayer1Unpacker.cc
@@ -35,8 +35,7 @@ namespace l1t {
             makeHCalTPGs(ctp7_phi, ctp7Data, res->getHcalDigis());
             makeHFTPGs(ctp7_phi, ctp7Data, res->getHcalDigis());
             makeRegions(ctp7_phi, ctp7Data, res->getRegions());
-          }
-          else if (HCALFB == 1) {
+          } else if (HCALFB == 1) {
             UCTCTP7RawData_HCALFB ctp7Data_HCALFB(ptr);
             makeECalTPGs_HCALFB(ctp7_phi, ctp7Data_HCALFB, res->getEcalDigis());
             makeHCalTPGs_HCALFB(ctp7_phi, ctp7Data_HCALFB, res->getHcalDigis());
@@ -54,8 +53,7 @@ namespace l1t {
             for (int i = 0; i < 5; i++) {
               makeECalTPGs5BX(ctp7_phi, ctp7Data5BX, res->getEcalDigisBx(i), i);
             }
-          }
-          else if (HCALFB == 1) {
+          } else if (HCALFB == 1) {
             UCTCTP7RawData5BX_HCALFB ctp7Data5BX_HCALFB(ptr);
             // BX_n = 0, 1, 2, 3, 4, where 2 is nominal
             makeECalTPGs5BX_HCALFB(ctp7_phi, ctp7Data5BX_HCALFB, res->getEcalDigis(), 2);