diff --git a/Geometry/HGCalCommonData/interface/HGCalProperty.h b/Geometry/HGCalCommonData/interface/HGCalProperty.h
index 92a350a440d6f..2d8c24794c593 100644
--- a/Geometry/HGCalCommonData/interface/HGCalProperty.h
+++ b/Geometry/HGCalCommonData/interface/HGCalProperty.h
@@ -39,6 +39,6 @@ namespace HGCalProperty {
   const int32_t kHGCalOffsetOrient = 100;
   const int32_t kHGCalOffsetType = 1;
   const int32_t kHGCalOffsetSiPM = 10;
-};
+};  // namespace HGCalProperty
 
 #endif
diff --git a/Geometry/HGCalCommonData/interface/HGCalTileIndex.h b/Geometry/HGCalCommonData/interface/HGCalTileIndex.h
index a27e58761c513..3d1059d8b27be 100644
--- a/Geometry/HGCalCommonData/interface/HGCalTileIndex.h
+++ b/Geometry/HGCalCommonData/interface/HGCalTileIndex.h
@@ -9,6 +9,6 @@ namespace HGCalTileIndex {
   int32_t tileLayer(int32_t index);
   int32_t tileRing(int32_t index);
   int32_t tilePhi(int32_t index);
-};
+};  // namespace HGCalTileIndex
 
 #endif
diff --git a/Geometry/HGCalCommonData/interface/HGCalWaferIndex.h b/Geometry/HGCalCommonData/interface/HGCalWaferIndex.h
index d9e58b8ac3b7b..6cc45320b4682 100644
--- a/Geometry/HGCalCommonData/interface/HGCalWaferIndex.h
+++ b/Geometry/HGCalCommonData/interface/HGCalWaferIndex.h
@@ -11,6 +11,6 @@ namespace HGCalWaferIndex {
   int32_t waferV(const int32_t index);
   int32_t waferCopy(const int32_t index);
   bool waferFormat(const int32_t index);
-};
+};  // namespace HGCalWaferIndex
 
 #endif
diff --git a/Geometry/HGCalCommonData/src/HGCalProperty.cc b/Geometry/HGCalCommonData/src/HGCalProperty.cc
index 6e6554be41c9d..de6a647d7a21d 100644
--- a/Geometry/HGCalCommonData/src/HGCalProperty.cc
+++ b/Geometry/HGCalCommonData/src/HGCalProperty.cc
@@ -1,22 +1,32 @@
 #include "Geometry/HGCalCommonData/interface/HGCalProperty.h"
 
 int32_t HGCalProperty::waferProperty(const int32_t thick, const int32_t part, const int32_t orient) {
-  return (((thick % HGCalProperty::kHGCalFactor) * HGCalProperty::kHGCalOffsetThick) + ((part % HGCalProperty::kHGCalFactor) * HGCalProperty::kHGCalOffsetPartial) +
+  return (((thick % HGCalProperty::kHGCalFactor) * HGCalProperty::kHGCalOffsetThick) +
+          ((part % HGCalProperty::kHGCalFactor) * HGCalProperty::kHGCalOffsetPartial) +
           ((orient % HGCalProperty::kHGCalFactor) * HGCalProperty::kHGCalOffsetOrient));
 }
 
-int32_t HGCalProperty::waferThick(const int32_t property) { return ((property / HGCalProperty::kHGCalOffsetThick) % HGCalProperty::kHGCalFactor); }
+int32_t HGCalProperty::waferThick(const int32_t property) {
+  return ((property / HGCalProperty::kHGCalOffsetThick) % HGCalProperty::kHGCalFactor);
+}
 
 int32_t HGCalProperty::waferPartial(const int32_t property) {
   return ((property / HGCalProperty::kHGCalOffsetPartial) % HGCalProperty::kHGCalFactor);
 }
 
-int32_t HGCalProperty::waferOrient(const int32_t property) { return ((property / HGCalProperty::kHGCalOffsetOrient) % HGCalProperty::kHGCalFactor); }
+int32_t HGCalProperty::waferOrient(const int32_t property) {
+  return ((property / HGCalProperty::kHGCalOffsetOrient) % HGCalProperty::kHGCalFactor);
+}
 
 int32_t HGCalProperty::tileProperty(const int32_t type, const int32_t sipm) {
-  return (((type % HGCalProperty::kHGCalFactor) * HGCalProperty::kHGCalOffsetType) + ((sipm % HGCalProperty::kHGCalFactor) * HGCalProperty::kHGCalOffsetSiPM));
+  return (((type % HGCalProperty::kHGCalFactor) * HGCalProperty::kHGCalOffsetType) +
+          ((sipm % HGCalProperty::kHGCalFactor) * HGCalProperty::kHGCalOffsetSiPM));
 }
 
-int32_t HGCalProperty::tileType(const int32_t property) { return ((property / HGCalProperty::kHGCalOffsetType) % HGCalProperty::kHGCalFactor); }
+int32_t HGCalProperty::tileType(const int32_t property) {
+  return ((property / HGCalProperty::kHGCalOffsetType) % HGCalProperty::kHGCalFactor);
+}
 
-int32_t HGCalProperty::tileSiPM(const int32_t property) { return ((property / HGCalProperty::kHGCalOffsetSiPM) % HGCalProperty::kHGCalFactor); }
+int32_t HGCalProperty::tileSiPM(const int32_t property) {
+  return ((property / HGCalProperty::kHGCalOffsetSiPM) % HGCalProperty::kHGCalFactor);
+}
diff --git a/Geometry/HGCalCommonData/src/HGCalTileIndex.cc b/Geometry/HGCalCommonData/src/HGCalTileIndex.cc
index d15c751683f31..07fd58efc0438 100644
--- a/Geometry/HGCalCommonData/src/HGCalTileIndex.cc
+++ b/Geometry/HGCalCommonData/src/HGCalTileIndex.cc
@@ -3,13 +3,20 @@
 
 int32_t HGCalTileIndex::tileIndex(int32_t layer, int32_t ring, int32_t phi) {
   int32_t id(0);
-  id |= (((phi & HGCalProperty::kHGCalPhiMask) << HGCalProperty::kHGCalPhiOffset) | ((ring & HGCalProperty::kHGCalRingMask) << HGCalProperty::kHGCalRingOffset) |
+  id |= (((phi & HGCalProperty::kHGCalPhiMask) << HGCalProperty::kHGCalPhiOffset) |
+         ((ring & HGCalProperty::kHGCalRingMask) << HGCalProperty::kHGCalRingOffset) |
          ((layer & HGCalProperty::kHGCalLayerMask) << HGCalProperty::kHGCalLayerOffset));
   return id;
 }
 
-int32_t HGCalTileIndex::tileLayer(int32_t id) { return ((id >> HGCalProperty::kHGCalLayerOffset) & HGCalProperty::kHGCalLayerMask); }
+int32_t HGCalTileIndex::tileLayer(int32_t id) {
+  return ((id >> HGCalProperty::kHGCalLayerOffset) & HGCalProperty::kHGCalLayerMask);
+}
 
-int32_t HGCalTileIndex::tileRing(int32_t id) { return ((id >> HGCalProperty::kHGCalRingOffset) & HGCalProperty::kHGCalRingMask); }
+int32_t HGCalTileIndex::tileRing(int32_t id) {
+  return ((id >> HGCalProperty::kHGCalRingOffset) & HGCalProperty::kHGCalRingMask);
+}
 
-int32_t HGCalTileIndex::tilePhi(int32_t id) { return ((id >> HGCalProperty::kHGCalPhiOffset) & HGCalProperty::kHGCalPhiMask); }
+int32_t HGCalTileIndex::tilePhi(int32_t id) {
+  return ((id >> HGCalProperty::kHGCalPhiOffset) & HGCalProperty::kHGCalPhiMask);
+}
diff --git a/Geometry/HGCalCommonData/src/HGCalWaferIndex.cc b/Geometry/HGCalCommonData/src/HGCalWaferIndex.cc
index 437324ec97fdb..c89efbd358f91 100644
--- a/Geometry/HGCalCommonData/src/HGCalWaferIndex.cc
+++ b/Geometry/HGCalCommonData/src/HGCalWaferIndex.cc
@@ -5,7 +5,8 @@ int32_t HGCalWaferIndex::waferIndex(int32_t layer, int32_t waferU, int32_t wafer
   int32_t id(0);
   if (old) {
     id |= (((waferU & HGCalProperty::kHGCalWaferCopyMask) << HGCalProperty::kHGCalWaferCopyOffset) |
-           ((layer & HGCalProperty::kHGCalLayerMask) << HGCalProperty::kHGCalLayerOffset) | HGCalProperty::kHGCalLayerOldMask);
+           ((layer & HGCalProperty::kHGCalLayerMask) << HGCalProperty::kHGCalLayerOffset) |
+           HGCalProperty::kHGCalLayerOldMask);
   } else {
     int waferUabs(std::abs(waferU)), waferVabs(std::abs(waferV));
     int waferUsign = (waferU >= 0) ? 0 : 1;
@@ -19,7 +20,9 @@ int32_t HGCalWaferIndex::waferIndex(int32_t layer, int32_t waferU, int32_t wafer
   return id;
 }
 
-int32_t HGCalWaferIndex::waferLayer(const int32_t id) { return (id >> HGCalProperty::kHGCalLayerOffset) & HGCalProperty::kHGCalLayerMask; }
+int32_t HGCalWaferIndex::waferLayer(const int32_t id) {
+  return (id >> HGCalProperty::kHGCalLayerOffset) & HGCalProperty::kHGCalLayerMask;
+}
 
 int32_t HGCalWaferIndex::waferU(const int32_t id) {
   int32_t iu = (id >> HGCalProperty::kHGCalWaferUOffset) & HGCalProperty::kHGCalWaferUMask;
@@ -31,6 +34,8 @@ int32_t HGCalWaferIndex::waferV(const int32_t id) {
   return (((id >> HGCalProperty::kHGCalWaferVSignOffset) & HGCalProperty::kHGCalWaferVSignMask) ? -iv : iv);
 }
 
-int32_t HGCalWaferIndex::waferCopy(const int32_t id) { return (id >> HGCalProperty::kHGCalWaferCopyOffset) & HGCalProperty::kHGCalWaferCopyMask; }
+int32_t HGCalWaferIndex::waferCopy(const int32_t id) {
+  return (id >> HGCalProperty::kHGCalWaferCopyOffset) & HGCalProperty::kHGCalWaferCopyMask;
+}
 
 bool HGCalWaferIndex::waferFormat(const int32_t id) { return ((id & HGCalProperty::kHGCalLayerOldMask) == 0); }
diff --git a/Geometry/HGCalCommonData/test/HGCalConvert.cpp b/Geometry/HGCalCommonData/test/HGCalConvert.cpp
index 5bab121c1febc..ad6685805e457 100644
--- a/Geometry/HGCalCommonData/test/HGCalConvert.cpp
+++ b/Geometry/HGCalCommonData/test/HGCalConvert.cpp
@@ -287,11 +287,14 @@ int ConvertSilicon::waferIndex(const int& layer, const int& waferU, const int& w
 }
 
 int ConvertSilicon::waferProperty(const int& thick, const int& part, const int& orient) {
-  return (((thick % HGCalProperty::kHGCalFactor) * HGCalProperty::kHGCalOffsetThick) + ((part % HGCalProperty::kHGCalFactor) * HGCalProperty::kHGCalOffsetPartial) +
+  return (((thick % HGCalProperty::kHGCalFactor) * HGCalProperty::kHGCalOffsetThick) +
+          ((part % HGCalProperty::kHGCalFactor) * HGCalProperty::kHGCalOffsetPartial) +
           ((orient % HGCalProperty::kHGCalFactor) * HGCalProperty::kHGCalOffsetOrient));
 }
 
-int ConvertSilicon::waferLayer(const int& id) { return (id >> HGCalProperty::kHGCalLayerOffset) & HGCalProperty::kHGCalLayerMask; }
+int ConvertSilicon::waferLayer(const int& id) {
+  return (id >> HGCalProperty::kHGCalLayerOffset) & HGCalProperty::kHGCalLayerMask;
+}
 
 int ConvertSilicon::waferU(const int& id) {
   int32_t iu = (id >> HGCalProperty::kHGCalWaferUOffset) & HGCalProperty::kHGCalWaferUMask;
@@ -303,11 +306,17 @@ int ConvertSilicon::waferV(const int& id) {
   return (((id >> HGCalProperty::kHGCalWaferVSignOffset) & HGCalProperty::kHGCalWaferVSignMask) ? -iv : iv);
 }
 
-int ConvertSilicon::waferThick(const int& property) { return ((property / HGCalProperty::kHGCalOffsetThick) % HGCalProperty::kHGCalFactor); }
+int ConvertSilicon::waferThick(const int& property) {
+  return ((property / HGCalProperty::kHGCalOffsetThick) % HGCalProperty::kHGCalFactor);
+}
 
-int ConvertSilicon::waferPartial(const int& property) { return ((property / HGCalProperty::kHGCalOffsetPartial) % HGCalProperty::kHGCalFactor); }
+int ConvertSilicon::waferPartial(const int& property) {
+  return ((property / HGCalProperty::kHGCalOffsetPartial) % HGCalProperty::kHGCalFactor);
+}
 
-int ConvertSilicon::waferOrient(const int& property) { return ((property / HGCalProperty::kHGCalOffsetOrient) % HGCalProperty::kHGCalFactor); }
+int ConvertSilicon::waferOrient(const int& property) {
+  return ((property / HGCalProperty::kHGCalOffsetOrient) % HGCalProperty::kHGCalFactor);
+}
 
 ConvertScintillator::ConvertScintillator(int layMin) : layMin_(layMin) {}
 
@@ -493,21 +502,33 @@ void ConvertScintillator::convert(const char* infile, const char* outfile, int d
 
 int ConvertScintillator::tileIndex(const int& layer, const int& ring, const int& iphi) {
   int id(0);
-  id |= (((iphi & HGCalProperty::kHGCalPhiMask) << HGCalProperty::kHGCalPhiOffset) | ((ring & HGCalProperty::kHGCalRingMask) << HGCalProperty::kHGCalRingOffset) |
+  id |= (((iphi & HGCalProperty::kHGCalPhiMask) << HGCalProperty::kHGCalPhiOffset) |
+         ((ring & HGCalProperty::kHGCalRingMask) << HGCalProperty::kHGCalRingOffset) |
          ((layer & HGCalProperty::kHGCalLayerMask) << HGCalProperty::kHGCalLayerOffset));
   return id;
 }
 
-int ConvertScintillator::tileLayer(const int& id) { return (id >> HGCalProperty::kHGCalLayerOffset) & HGCalProperty::kHGCalLayerMask; }
+int ConvertScintillator::tileLayer(const int& id) {
+  return (id >> HGCalProperty::kHGCalLayerOffset) & HGCalProperty::kHGCalLayerMask;
+}
 
-int ConvertScintillator::tileRing(const int& id) { return (id >> HGCalProperty::kHGCalRingOffset) & HGCalProperty::kHGCalRingMask; }
+int ConvertScintillator::tileRing(const int& id) {
+  return (id >> HGCalProperty::kHGCalRingOffset) & HGCalProperty::kHGCalRingMask;
+}
 
-int ConvertScintillator::tilePhi(const int& id) { return (id >> HGCalProperty::kHGCalPhiOffset) & HGCalProperty::kHGCalPhiMask; }
+int ConvertScintillator::tilePhi(const int& id) {
+  return (id >> HGCalProperty::kHGCalPhiOffset) & HGCalProperty::kHGCalPhiMask;
+}
 
 int ConvertScintillator::tileProperty(const int& type, const int& sipm) {
-  return (((type % HGCalProperty::kHGCalFactor) * HGCalProperty::kHGCalOffsetType) + ((sipm % HGCalProperty::kHGCalFactor) * HGCalProperty::kHGCalOffsetSiPM));
+  return (((type % HGCalProperty::kHGCalFactor) * HGCalProperty::kHGCalOffsetType) +
+          ((sipm % HGCalProperty::kHGCalFactor) * HGCalProperty::kHGCalOffsetSiPM));
 }
 
-int ConvertScintillator::tileType(const int& property) { return ((property / HGCalProperty::kHGCalOffsetType) % HGCalProperty::kHGCalFactor); }
+int ConvertScintillator::tileType(const int& property) {
+  return ((property / HGCalProperty::kHGCalOffsetType) % HGCalProperty::kHGCalFactor);
+}
 
-int ConvertScintillator::tileSiPM(const int& property) { return ((property / HGCalProperty::kHGCalOffsetSiPM) % HGCalProperty::kHGCalFactor); }
+int ConvertScintillator::tileSiPM(const int& property) {
+  return ((property / HGCalProperty::kHGCalOffsetSiPM) % HGCalProperty::kHGCalFactor);
+}