diff --git a/dumux/multidomain/facet/box/fvelementgeometry.hh b/dumux/multidomain/facet/box/fvelementgeometry.hh
index 17d8bf724e786ed7833b79230d2434a6bdfe6655..7a26d8029d83df8974cc762e86c6abed1238124e 100644
--- a/dumux/multidomain/facet/box/fvelementgeometry.hh
+++ b/dumux/multidomain/facet/box/fvelementgeometry.hh
@@ -174,18 +174,19 @@ public:
         assert(isBound());
         using ScvfGeometry = typename SubControlVolumeFace::Traits::Geometry;
         const GeometryHelper geometryHelper(element().geometry());
-        typename SubControlVolumeFace::Traits::CornerStorage corners;
         if (scvf.boundary() || scvf.interiorBoundary())
-        {
-            corners = geometryHelper.getBoundaryScvfCorners(scvf.facetIndexInElement(),
-                                                            scvf.indexInElementFacet());
-            return { Dune::GeometryTypes::cube(ScvfGeometry::mydimension), corners };
-        }
-        else
-        {
-            corners = geometryHelper.getScvfCorners(scvf.index());
-            return { Dune::GeometryTypes::cube(ScvfGeometry::mydimension), corners };
-        }
+            return {
+                Dune::GeometryTypes::cube(ScvfGeometry::mydimension),
+                geometryHelper.getBoundaryScvfCorners(
+                    scvf.facetIndexInElement(),
+                    scvf.indexInElementFacet()
+                )
+            };
+        
+        return { 
+            Dune::GeometryTypes::cube(ScvfGeometry::mydimension), 
+            geometryHelper.getScvfCorners(scvf.index())
+        };
     }
 
 private:
@@ -345,11 +346,10 @@ public:
                 )
             };
 
-        else
-            return {
-                Dune::GeometryTypes::cube(ScvfGeometry::mydimension),
-                geometryHelper.getScvfCorners(scvf.index())
-            };
+        return {
+            Dune::GeometryTypes::cube(ScvfGeometry::mydimension),
+            geometryHelper.getScvfCorners(scvf.index())
+        };
     }
 
 private: