Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs
===================================================================
diff -u -r1239 -r1241
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs	(.../DamMacroStabilityInwardsKernelWrapper.cs)	(revision 1239)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/DamMacroStabilityInwards/DamMacroStabilityInwardsKernelWrapper.cs	(.../DamMacroStabilityInwardsKernelWrapper.cs)	(revision 1241)
@@ -551,7 +551,6 @@
             }
             string mstabProjectFilename = DamMacroStabilityUtils.GetStabilityInputFileName(damKernelInput, iterationIndex, model, projectWorkingPath);
             var location = damKernelInput.Location;
-            var surfaceLine = damKernelInput.Location.SurfaceLine;
             var subSoilScenario = damKernelInput.SubSoilScenario;
             double riverLevel = damKernelInput.RiverLevelHigh;
             List<LogMessage> errorMessages;
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorShoulderPerPoint.cs
===================================================================
diff -u -r1211 -r1241
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorShoulderPerPoint.cs	(.../DesignCalculatorShoulderPerPoint.cs)	(revision 1211)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorShoulderPerPoint.cs	(.../DesignCalculatorShoulderPerPoint.cs)	(revision 1241)
@@ -39,11 +39,9 @@
     /// </summary>
     public class DesignCalculatorShoulderPerPoint
     {
-        private const double CMinimumShoulderElevation = 0.5;
-        private const double CMinimumShoulderExtraElevation = 0.05;
-        private const double CMinimumShoulderWidth = 2;
-        private const double CMinimumShoulderExtraWidth = 1;
-        private const double CToleranceShoulderChanges = 0.001;
+        private const double minimumShoulderElevation = 0.5;
+        private const double minimumShoulderWidth = 2;
+        private const double toleranceShoulderChanges = 0.001;
 
         /// <summary>
         /// Performs the design calculation shoulder iterative per point.
@@ -103,14 +101,14 @@
                 }
                 if (desiredShoulderLength > 0)
                 {
-                    desiredShoulderLength = Math.Max(desiredShoulderLength, CMinimumShoulderWidth);
+                    desiredShoulderLength = Math.Max(desiredShoulderLength, minimumShoulderWidth);
                 }
                 if (desiredShoulderLength > 0)
                 {
-                    desiredShoulderHeight = Math.Max(desiredShoulderHeight, CMinimumShoulderElevation);
+                    desiredShoulderHeight = Math.Max(desiredShoulderHeight, minimumShoulderElevation);
                 }
-                bool isNewShoulderSameAsOriginal = ((Math.Abs(desiredShoulderLength - orgShoulderLength) < CToleranceShoulderChanges) &&
-                                                    (Math.Abs(desiredShoulderHeight - orgShoulderHeight) < CToleranceShoulderChanges));
+                bool isNewShoulderSameAsOriginal = ((Math.Abs(desiredShoulderLength - orgShoulderLength) < toleranceShoulderChanges) &&
+                                                    (Math.Abs(desiredShoulderHeight - orgShoulderHeight) < toleranceShoulderChanges));
                 SurfaceLine2 newSurfaceLine;
                 if (isNewShoulderSameAsOriginal)
                 {
@@ -189,22 +187,22 @@
         {
             const double cDiff = 0.5;
             var newLine = new List<GeometryPoint>();
-            double X = originalLine.First().X;
+            double currentX = originalLine.First().X;
             foreach (var point in originalLine)
             {
-                while (point.X > X + cDiff)
+                while (point.X > currentX + cDiff)
                 {
                     var newPoint = new GeometryPoint(point)
                     {
-                        X = X + cDiff
+                        X = currentX + cDiff
                     };
                     if (newPoint.X > newLine.Last().X)
                     {
                         newPoint.Z = newLine.Last().Z + ((newPoint.X - newLine.Last().X) / (point.X - newLine.Last().X)) *
                                      (point.Z - newLine.Last().Z);
                         newLine.Add(newPoint);
                     }
-                    X = newPoint.X;
+                    currentX = newPoint.X;
                 }
                 newLine.Add(point);
             }
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorException.cs
===================================================================
diff -u -r1052 -r1241
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorException.cs	(.../DesignCalculatorException.cs)	(revision 1052)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorException.cs	(.../DesignCalculatorException.cs)	(revision 1241)
@@ -1,9 +1,26 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+// Copyright (C) Stichting Deltares 2018. All rights reserved.
+//
+// This file is part of the Dam Engine.
+//
+// The Dam Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
 
+using System;
+
 namespace Deltares.DamEngine.Calculators.DikesDesign
 {
     /// <summary>