Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/SoilProfile2DHelper.cs
===================================================================
diff -u -r5983 -r5997
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/SoilProfile2DHelper.cs	(.../SoilProfile2DHelper.cs)	(revision 5983)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Common/SoilProfile2DHelper.cs	(.../SoilProfile2DHelper.cs)	(revision 5997)
@@ -70,24 +70,16 @@
         foreach (double xCoordinate in xCoordinates.Where(xCoordinate => xCoordinate.IsGreaterThanOrEqualTo(xStart)))
         {
             SoilProfile1D crossSection = soilProfile.GetSoilProfile1D(xCoordinate);
-            if (aquiferType == LayerType.BottomAquiferCluster)
+            switch (aquiferType)
             {
-                if (crossSection.Layers.All(layer => layer.IsAquifer))
-                {
+                case LayerType.BottomAquiferCluster when crossSection.Layers.All(layer => layer.IsAquifer):
                     intersectionPoint.X = xCoordinate;
                     intersectionPoint.Z = crossSection.TopLevel;
                     return true;
-                }
-            }
-
-            if (aquiferType == LayerType.InBetweenAquiferCluster)
-            {
-                if (crossSection.Layers[0].IsAquifer && crossSection.Layers.Any(layer => !layer.IsAquifer))
-                {
+                case LayerType.InBetweenAquiferCluster when crossSection.Layers[0].IsAquifer && crossSection.Layers.Any(layer => !layer.IsAquifer):
                     intersectionPoint.X = xCoordinate;
                     intersectionPoint.Z = crossSection.TopLevel;
                     return true;
-                }
             }
         }