diff --git a/Core/src/Geometry/CuboidVolumeBuilder.cpp b/Core/src/Geometry/CuboidVolumeBuilder.cpp
index f3201d7c8d1ab7a9e8d45cef38652de9841e6134..da0a38e8e76b21acfd1b031adc3c9b7a0d6ef803 100644
--- a/Core/src/Geometry/CuboidVolumeBuilder.cpp
+++ b/Core/src/Geometry/CuboidVolumeBuilder.cpp
@@ -143,38 +143,34 @@ std::shared_ptr<Acts::TrackingVolume> Acts::CuboidVolumeBuilder::buildVolume(
       layArrCreator.layerArray(gctx, layVec, minMax.first, minMax.second,
                                BinningType::arbitrary, BinningValue::binX));
 
-	// Build confined volumes
-	if(cfg.trackingVolumes.empty())
-		for(VolumeConfig vc : cfg.volumeCfg)
-			cfg.trackingVolumes.push_back(buildVolume(gctx, vc));
-	
-	
-	std::shared_ptr<TrackingVolume> trackVolume;
-  if(layVec.empty())
-	{
-	  // Build TrackingVolume
-	  trackVolume
-		  = TrackingVolume::create(std::make_shared<const Transform3D>(trafo),
-								   bounds,
-								   cfg.volumeMaterial,
-								   nullptr,
-								   nullptr,
-								   cfg.trackingVolumes,
-								   cfg.name);
-	}
-	else
-	{
-	
-  // Build TrackingVolume
-  trackVolume
-      = TrackingVolume::create(std::make_shared<const Transform3D>(trafo),
-                               bounds,
-                               cfg.volumeMaterial,
-                               std::move(layArr),
-                               nullptr,
-                               cfg.trackingVolumes,
-                               cfg.name);
-   }
+  // Build confined volumes
+  if (cfg.trackingVolumes.empty())
+    for (VolumeConfig vc : cfg.volumeCfg)
+      cfg.trackingVolumes.push_back(buildVolume(gctx, vc));
+
+  std::shared_ptr<TrackingVolume> trackVolume;
+  if (layVec.empty()) {
+    // Build TrackingVolume
+    trackVolume
+        = TrackingVolume::create(std::make_shared<const Transform3D>(trafo),
+                                 bounds,
+                                 cfg.volumeMaterial,
+                                 nullptr,
+                                 nullptr,
+                                 cfg.trackingVolumes,
+                                 cfg.name);
+  } else {
+
+    // Build TrackingVolume
+    trackVolume
+        = TrackingVolume::create(std::make_shared<const Transform3D>(trafo),
+                                 bounds,
+                                 cfg.volumeMaterial,
+                                 std::move(layArr),
+                                 nullptr,
+                                 cfg.trackingVolumes,
+                                 cfg.name);
+  }
   trackVolume->sign(GeometrySignature::Global);
 
   return trackVolume;