Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs
===================================================================
diff -u -r6479 -r6501
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs	(.../FillMacroStabilityWrapperInputFromEngine.cs)	(revision 6479)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/FillMacroStabilityWrapperInputFromEngine.cs	(.../FillMacroStabilityWrapperInputFromEngine.cs)	(revision 6501)
@@ -51,8 +51,7 @@
 /// </summary>
 public class FillMacroStabilityWrapperInputFromEngine
 {
-    private readonly Dictionary<string, Soil> soilsDictionary =
-        new Dictionary<string, Soil>();
+    private readonly Dictionary<string, Soil> soilsDictionary = new();
 
     /// <summary>
     /// Creates the macro stability input.
@@ -371,7 +370,7 @@
         return line;
     }
 
-    private void TransferBishopSearchAreaSettings(SearchAreaConditions kernelSearchAreaConditions, BishopCalculationGrid bishopCalculationGrid)
+    private static void TransferBishopSearchAreaSettings(SearchAreaConditions kernelSearchAreaConditions, BishopCalculationGrid bishopCalculationGrid)
     {
         // In the Macrostability kernel, for Bishop, the automatic tangent lines are set by AutoSearchArea = True.
         // Setting AutoTangentLines to true will create the automatic tangent lines of Uplift-Van which is not desired.
@@ -382,7 +381,7 @@
         kernelSearchAreaConditions.TangentLineZBottom = bishopCalculationGrid.TangentLineZBottom;
     }
 
-    private void TransferUpliftVanSearchAreaSettings(SearchAreaConditions kernelSearchAreaConditions, UpliftVanCalculationGrid upliftVanCalculationGrid)
+    private static void TransferUpliftVanSearchAreaSettings(SearchAreaConditions kernelSearchAreaConditions, UpliftVanCalculationGrid upliftVanCalculationGrid)
     {
         kernelSearchAreaConditions.AutoTangentLines = upliftVanCalculationGrid.TangentLinesCreationMethod is TangentLinesDefinition.Automatic or TangentLinesDefinition.OnBoundaryLines;
         kernelSearchAreaConditions.AutoSearchArea = upliftVanCalculationGrid.IsGridsAutomatic;
@@ -393,7 +392,7 @@
         kernelSearchAreaConditions.TangentLineZBottom = upliftVanCalculationGrid.TangentLineZBottom;
     }
 
-    private void TransferBishopCalculationGrid(BishopCalculationCircle kernelBishopCalculationCircle, BishopCalculationGrid bishopCalculationGrid)
+    private static void TransferBishopCalculationGrid(BishopCalculationCircle kernelBishopCalculationCircle, BishopCalculationGrid bishopCalculationGrid)
     {
         if (kernelBishopCalculationCircle == null)
         {
@@ -420,7 +419,7 @@
         }
     }
 
-    private void TransferUpliftVanCalculationGrid(KernelUpliftVanCalculationGrid kernelUpliftVanCalculationGrid, UpliftVanCalculationGrid upliftVanCalculationGrid)
+    private static void TransferUpliftVanCalculationGrid(KernelUpliftVanCalculationGrid kernelUpliftVanCalculationGrid, UpliftVanCalculationGrid upliftVanCalculationGrid)
     {
         if (kernelUpliftVanCalculationGrid == null)
         {
@@ -457,7 +456,7 @@
         }
     }
 
-    private void TransferUniformLoads(TrafficLoad damTrafficLoad, ICollection<UniformLoad> kernelUniformLoads)
+    private static void TransferUniformLoads(TrafficLoad damTrafficLoad, ICollection<UniformLoad> kernelUniformLoads)
     {
         if (damTrafficLoad != null)
         {
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs
===================================================================
diff -u -r6498 -r6501
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs	(.../MacroStabilityInwardsKernelWrapper.cs)	(revision 6498)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapper.cs	(.../MacroStabilityInwardsKernelWrapper.cs)	(revision 6501)
@@ -128,7 +128,7 @@
                         return PrepareResult.NotRelevant;
                     }
                 }
-
+                
                 FailureMechanismParametersMStab.MStabParameters.Model = model;
 
                 macroStabilityInput.WaterNet = waterNet;
@@ -477,7 +477,7 @@
         }
     }
 
-    private void AddFileNameToLogMessages(List<LogMessage> messages, string fileName)
+    private static void AddFileNameToLogMessages(List<LogMessage> messages, string fileName)
     {
         fileName = Path.GetFileNameWithoutExtension(fileName);
         foreach (LogMessage logMessage in messages)
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs
===================================================================
diff -u -r6486 -r6501
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs	(.../MacroStabilityCommonHelper.cs)	(revision 6486)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelper.cs	(.../MacroStabilityCommonHelper.cs)	(revision 6501)
@@ -21,6 +21,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Data;
 using System.IO;
 using System.Linq;
@@ -491,7 +492,7 @@
                 CreateCalculationGridUpliftVan(kernelModelStabilityModel, stabilityOutputItem);
                 break;
             default:
-                throw new ArgumentOutOfRangeException(nameof(kernelModelStabilityModel.ModelOption), kernelModelStabilityModel.ModelOption, null);
+                throw new InvalidEnumArgumentException(nameof(kernelModelStabilityModel.ModelOption), (int) kernelModelStabilityModel.ModelOption, typeof(ModelOptions));
         }
     }
 
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityKernelInterface.cs
===================================================================
diff -u -r6465 -r6501
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityKernelInterface.cs	(.../MacroStabilityKernelInterface.cs)	(revision 6465)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityInwards/MacroStabilityKernelInterface.cs	(.../MacroStabilityKernelInterface.cs)	(revision 6501)
@@ -32,6 +32,6 @@
     /// <value>
     /// The input.
     /// </value>
-    public MacroStabilityInterface Input { get; set; } // = new (fullInputModelType);
+    public MacroStabilityInterface Input { get; set; } 
     
 }
\ No newline at end of file