diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalMixRotatedLayer.cc b/Geometry/HGCalCommonData/plugins/DDHGCalMixRotatedLayer.cc
index 818a31b70fada..0cb5d8fbfc518 100644
--- a/Geometry/HGCalCommonData/plugins/DDHGCalMixRotatedLayer.cc
+++ b/Geometry/HGCalCommonData/plugins/DDHGCalMixRotatedLayer.cc
@@ -95,7 +95,7 @@ class DDHGCalMixRotatedLayer : public DDAlgorithm {
   std::vector<double> layerThickTop_;     // Thickness of the top sections
   std::vector<int> layerTypeTop_;         // Type of the Top layer
   std::vector<int> copyNumberTop_;        // Initial copy numbers (top section)
-  std::vector<int> layerOrient_;           // Layer type of silicon layers
+  std::vector<int> layerOrient_;          // Layer type of silicon layers
   std::vector<int> waferIndex_;           // Wafer index for the types
   std::vector<int> waferProperty_;        // Wafer property
   std::vector<int> waferLayerStart_;      // Start index of wafers in each layer
@@ -509,7 +509,7 @@ void DDHGCalMixRotatedLayer::positionMix(const DDLogicalPart& glog,
   int layercenter = (layerOrient_[layer] == HGCalTypes::CornerCenteredLambda)
                         ? HGCalTypes::CornerCenterYp
                         : ((layerOrient_[layer] == HGCalTypes::CornerCenteredY) ? HGCalTypes::CornerCenterYm
-                                                                               : HGCalTypes::WaferCenter);
+                                                                                : HGCalTypes::WaferCenter);
   int layertype = (layerOrient_[layer] == HGCalTypes::WaferCenteredBack) ? 1 : 0;
   int firstWafer = waferLayerStart_[layer];
   int lastWafer = ((layer + 1 < static_cast<int>(waferLayerStart_.size())) ? waferLayerStart_[layer + 1]
@@ -521,8 +521,8 @@ void DDHGCalMixRotatedLayer::positionMix(const DDLogicalPart& glog,
 #ifdef EDM_ML_DEBUG
   int ium(0), ivm(0), kount(0);
   std::vector<int> ntype(3, 0);
-  edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedLayer: " << glog.ddname() << "  r " << delx << " R " << dely << " dy "
-                                << dy << " Shift " << xyoff.first << ":" << xyoff.second << " WaferSize "
+  edm::LogVerbatim("HGCalGeom") << "DDHGCalMixRotatedLayer: " << glog.ddname() << "  r " << delx << " R " << dely
+                                << " dy " << dy << " Shift " << xyoff.first << ":" << xyoff.second << " WaferSize "
                                 << (waferSize_ + waferSepar_) << " index " << firstWafer << ":" << (lastWafer - 1);
 #endif
   for (int k = firstWafer; k < lastWafer; ++k) {
diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalSiliconRotatedModule.cc b/Geometry/HGCalCommonData/plugins/DDHGCalSiliconRotatedModule.cc
index fd37b1614aa00..fc7ef369621b2 100644
--- a/Geometry/HGCalCommonData/plugins/DDHGCalSiliconRotatedModule.cc
+++ b/Geometry/HGCalCommonData/plugins/DDHGCalSiliconRotatedModule.cc
@@ -392,7 +392,7 @@ void DDHGCalSiliconRotatedModule::positionSensitive(const DDLogicalPart& glog, i
   int layercenter = (layerOrient_[layer] == HGCalTypes::CornerCenteredLambda)
                         ? HGCalTypes::CornerCenterYp
                         : ((layerOrient_[layer] == HGCalTypes::CornerCenteredY) ? HGCalTypes::CornerCenterYm
-                                                                               : HGCalTypes::WaferCenter);
+                                                                                : HGCalTypes::WaferCenter);
   int layertype = (layerOrient_[layer] == HGCalTypes::WaferCenteredBack) ? 1 : 0;
   int firstWafer = waferLayerStart_[layer];
   int lastWafer = ((layer + 1 < static_cast<int>(waferLayerStart_.size())) ? waferLayerStart_[layer + 1]
diff --git a/Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalSiliconRotatedModule.cc b/Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalSiliconRotatedModule.cc
index 657545c7e3d34..2743ca2f78a9b 100644
--- a/Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalSiliconRotatedModule.cc
+++ b/Geometry/HGCalCommonData/plugins/dd4hep/DDHGCalSiliconRotatedModule.cc
@@ -328,7 +328,7 @@ struct HGCalSiliconRotatedModule {
     int layercenter = (layerOrient_[layer] == HGCalTypes::CornerCenteredLambda)
                           ? HGCalTypes::CornerCenterYp
                           : ((layerOrient_[layer] == HGCalTypes::CornerCenteredY) ? HGCalTypes::CornerCenterYm
-                                                                                 : HGCalTypes::WaferCenter);
+                                                                                  : HGCalTypes::WaferCenter);
     int layertype = (layerOrient_[layer] == HGCalTypes::WaferCenteredBack) ? 1 : 0;
     int firstWafer = waferLayerStart_[layer];
     int lastWafer = ((layer + 1 < static_cast<int>(waferLayerStart_.size())) ? waferLayerStart_[layer + 1]