Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryCurve.cs
===================================================================
diff -u -r5460 -r5483
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryCurve.cs	(.../GeometryCurve.cs)	(revision 5460)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geometry/GeometryCurve.cs	(.../GeometryCurve.cs)	(revision 5483)
@@ -29,11 +29,6 @@
 public enum CurveDirection
 {
     /// <summary>
-    /// Unknown as direction
-    /// </summary>
-    Unknown = -1,
-
-    /// <summary>
     /// Forward as direction
     /// </summary>
     Forward = 0,
@@ -75,21 +70,24 @@
     {
         get
         {
-            if (string.IsNullOrEmpty(base.Name))
+            if (!string.IsNullOrEmpty(base.Name))
             {
-                var text = "";
-                if (HeadPoint != null)
-                {
-                    text += HeadPoint.ToString()?.Trim();
-                }
+                return base.Name;
+            }
 
-                text += "-";
-                if (EndPoint != null)
-                {
-                    text += EndPoint.ToString()?.Trim();
-                }
-                base.Name = text;
+            var text = "";
+            if (HeadPoint != null)
+            {
+                text += HeadPoint.ToString()?.Trim();
             }
+
+            text += "-";
+            if (EndPoint != null)
+            {
+                text += EndPoint.ToString()?.Trim();
+            }
+
+            base.Name = text;
             return base.Name;
         }
         set => base.Name = value;
@@ -100,29 +98,17 @@
     /// </summary>
     public virtual Point2D HeadPoint
     {
-        get
-        {
-            return headPoint;
-        }
-        set
-        {
-            headPoint = value;
-        }
+        get => headPoint;
+        set => headPoint = value;
     }
 
     /// <summary>
     /// Gets or sets the end point of the curve.
     /// </summary>
     public virtual Point2D EndPoint
     {
-        get
-        {
-            return endPoint;
-        }
-        set
-        {
-            endPoint = value;
-        }
+        get => endPoint;
+        set => endPoint = value;
     }
 
     /// <summary>
@@ -151,9 +137,7 @@
     /// </summary>
     public void Reverse()
     {
-        Point2D point = HeadPoint;
-        HeadPoint = EndPoint;
-        EndPoint = point;
+        (HeadPoint, EndPoint) = (EndPoint, HeadPoint);
     }
 
     /// <summary>
@@ -163,12 +147,7 @@
     /// <returns>Returns the head point in the given direction</returns>
     public Point2D GetHeadPoint(CurveDirection aDirection)
     {
-        if (aDirection == CurveDirection.Forward)
-        {
-            return headPoint;
-        }
-
-        return endPoint;
+        return aDirection == CurveDirection.Forward ? headPoint : endPoint;
     }
 
     /// <summary>
@@ -178,12 +157,7 @@
     /// <returns>Returns the end point in the given direction</returns>
     public Point2D GetEndPoint(CurveDirection aDirection)
     {
-        if (aDirection == CurveDirection.Forward)
-        {
-            return endPoint;
-        }
-
-        return headPoint;
+        return aDirection == CurveDirection.Forward ? endPoint : headPoint;
     }
 
     /// <summary>
@@ -199,50 +173,22 @@
     }
 
     /// <summary>
-    /// Gets the geometry bounds.
-    /// </summary>
-    /// <returns></returns>
-    public override GeometryBounds GetGeometryBounds()
-    {
-        if (HeadPoint != null && EndPoint != null)
-        {
-            var head = new GeometryBounds(HeadPoint.X, HeadPoint.X, HeadPoint.Z, HeadPoint.Z);
-            var end = new GeometryBounds(EndPoint.X, EndPoint.X, EndPoint.Z, EndPoint.Z);
-            return head + end;
-        }
-
-        return null;
-    }
-
-    /// <summary>
-    /// Returns a string that represents the current object.
-    /// </summary>
-    /// <returns>
-    /// A string that represents the current object.
-    /// </returns>
-    /// <filterpriority>2</filterpriority>
-    public override string ToString()
-    {
-        return string.Empty;
-    }
-    
-    /// <summary>
     /// Assigns the surfaces from the curve.
     /// </summary>
     /// <param name="aCurve"></param>
     public void AssignSurfacesFromCurve(GeometryCurve aCurve)
     {
         if (aCurve.SurfaceAtLeft != SurfaceAtLeft)
         {
-            SurfaceAtLeft = aCurve.SurfaceAtLeft;    
+            SurfaceAtLeft = aCurve.SurfaceAtLeft;
         }
 
         if (aCurve.SurfaceAtRight != SurfaceAtRight)
         {
             SurfaceAtRight = aCurve.SurfaceAtRight;
         }
     }
-    
+
     /// <summary>
     /// Clones the curve.
     /// </summary>
@@ -259,10 +205,40 @@
         {
             curve.SurfaceAtLeft = SurfaceAtLeft;
         }
+
         if (SurfaceAtRight != null)
         {
             curve.SurfaceAtRight = SurfaceAtRight;
         }
+
         return curve;
     }
+
+    /// <summary>
+    /// Gets the geometry bounds.
+    /// </summary>
+    /// <returns></returns>
+    public override GeometryBounds GetGeometryBounds()
+    {
+        if (HeadPoint != null && EndPoint != null)
+        {
+            var head = new GeometryBounds(HeadPoint.X, HeadPoint.X, HeadPoint.Z, HeadPoint.Z);
+            var end = new GeometryBounds(EndPoint.X, EndPoint.X, EndPoint.Z, EndPoint.Z);
+            return head + end;
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// Returns a string that represents the current object.
+    /// </summary>
+    /// <returns>
+    /// A string that represents the current object.
+    /// </returns>
+    /// <filterpriority>2</filterpriority>
+    public override string ToString()
+    {
+        return string.Empty;
+    }
 }
\ No newline at end of file