Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/Point2D.cs
===================================================================
diff -u -r5564 -r5741
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/Point2D.cs	(.../Point2D.cs)	(revision 5564)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/Point2D.cs	(.../Point2D.cs)	(revision 5741)
@@ -86,13 +86,13 @@
     }
 
     /// <summary>
-    /// Initializes the point coordinates wi    th the coordinates of the given point
+    /// Initializes the point coordinates with the coordinates of the given point
     /// </summary>
-    /// <param name="aPoint"></param>
-    public void Init(Point2D aPoint)
+    /// <param name="point"></param>
+    public void Init(Point2D point)
     {
-        X = aPoint.X;
-        Z = aPoint.Z;
+        X = point.X;
+        Z = point.Z;
     }
 
     /// <summary>
@@ -110,34 +110,34 @@
     /// <summary>
     /// Minus operator for 2D points
     /// </summary>
-    /// <param name="aPoint2"></param>
-    /// <param name="aPoint1"></param>
+    /// <param name="point2"></param>
+    /// <param name="point1"></param>
     /// <returns></returns>
-    public static Point2D operator -(Point2D aPoint2, Point2D aPoint1)
+    public static Point2D operator -(Point2D point2, Point2D point1)
     {
-        return new Point2D(aPoint2.X - aPoint1.X, aPoint2.Z - aPoint1.Z);
+        return new Point2D(point2.X - point1.X, point2.Z - point1.Z);
     }
 
     /// <summary>
     /// Times operator for 2D points
     /// </summary>
-    /// <param name="aValue1"></param>
-    /// <param name="aPoint1"></param>
+    /// <param name="value"></param>
+    /// <param name="point"></param>
     /// <returns></returns>
-    public static Point2D operator *(double aValue1, Point2D aPoint1)
+    public static Point2D operator *(double value, Point2D point)
     {
-        return new Point2D(aValue1 * aPoint1.X, aValue1 * aPoint1.Z);
+        return new Point2D(value * point.X, value * point.Z);
     }
 
     /// <summary>
     /// Sum operator for 2D points
     /// </summary>
-    /// <param name="aPoint2"></param>
-    /// <param name="aPoint1"></param>
+    /// <param name="point2"></param>
+    /// <param name="point1"></param>
     /// <returns></returns>
-    public static Point2D operator +(Point2D aPoint2, Point2D aPoint1)
+    public static Point2D operator +(Point2D point2, Point2D point1)
     {
-        return new Point2D(aPoint2.X + aPoint1.X, aPoint2.Z + aPoint1.Z);
+        return new Point2D(point2.X + point1.X, point2.Z + point1.Z);
     }
 
     /// <summary>
Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/Routines2D.cs
===================================================================
diff -u -r5687 -r5741
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/Routines2D.cs	(.../Routines2D.cs)	(revision 5687)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/Routines2D.cs	(.../Routines2D.cs)	(revision 5741)
@@ -792,24 +792,24 @@
     
     private static double CalculateSquaredDistance(Point2D point, Point2D lineStart, Point2D lineEnd)
     {
-        Point2D point2D1 = lineEnd - lineStart;
-        Point2D point2D2 = point - lineStart;
-        double SquareXAndZValues(Point2D first, Point2D second) => first.X * second.X + first.Z * second.Z;
-        double num1 = SquareXAndZValues(point2D2, point2D1);
-        double num2 = SquareXAndZValues(point2D1, point2D1);
+        Point2D distanceVectorLineStartToEnd  = lineEnd - lineStart;
+        Point2D distanceVectorLineStartToPoint = point - lineStart;
+        double DotProduct(Point2D first, Point2D second) => first.X * second.X + first.Z * second.Z;
+        double dotProductLineStartAndEnd = DotProduct(distanceVectorLineStartToPoint, distanceVectorLineStartToEnd );
+        double dotProductPointAndLineStart = DotProduct(distanceVectorLineStartToEnd , distanceVectorLineStartToEnd );
         Point2D point2D3;
-        if (num1 <= 0.0)
+        if (dotProductLineStartAndEnd <= 0.0)
             point2D3 = point - lineStart;
-        else if (num2 <= num1)
+        else if (dotProductPointAndLineStart <= dotProductLineStartAndEnd)
         {
             point2D3 = point - lineEnd;
         }
         else
         {
-            double num3 = num1 / num2;
-            Point2D point2D4 = lineStart + num3 * point2D1;
+            double vectorToClosestPointOnLine = dotProductLineStartAndEnd / dotProductPointAndLineStart;
+            Point2D point2D4 = lineStart + vectorToClosestPointOnLine * distanceVectorLineStartToEnd ;
             point2D3 = point - point2D4;
         }
-        return SquareXAndZValues(point2D3, point2D3);
+        return DotProduct(point2D3, point2D3);
     }
 }
\ No newline at end of file