Index: src/Common/NetTopologySuite/Triangulate/QuadEdge/QuadEdge.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r5fc71a385897af92ccb092f2f969b5709afab85a
--- src/Common/NetTopologySuite/Triangulate/QuadEdge/QuadEdge.cs	(.../QuadEdge.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ src/Common/NetTopologySuite/Triangulate/QuadEdge/QuadEdge.cs	(.../QuadEdge.cs)	(revision 5fc71a385897af92ccb092f2f969b5709afab85a)
@@ -26,7 +26,95 @@
     /// <author>Martin Davis</author>
     public class QuadEdge
     {
+        // the dual of this edge, directed from right to left
+//    private int      visitedKey = 0;
+
         /// <summary>
+        /// Quadedges must be made using {@link makeEdge}, 
+        /// to ensure proper construction.
+        /// </summary>
+        private QuadEdge() {}
+
+        /// <summary>
+        /// Gets or sets the external data value for this edge.
+        /// </summary>
+        /// <remarks>
+        /// an object containing external data
+        /// </remarks>
+        public object Data { set; get; }
+
+        /// <summary>
+        /// Tests whether this edge has been deleted.
+        /// </summary>
+        /// <returns>true if this edge has not been deleted.</returns>
+        public bool IsLive
+        {
+            get
+            {
+                return Rot != null;
+            }
+        }
+
+        /***********************************************************************************************
+         * Data Access
+         **********************************************************************************************/
+        /*
+        /// <summary>
+        /// Sets the vertex for this edge's origin
+        /// </summary>
+        /// <param name="o">the origin vertex</param>
+        internal void SetOrig(Vertex o)
+        {
+            _vertex = o;
+        }
+         */
+
+        /*
+        /// <summary>
+        /// Sets the vertex for this edge's destination
+        /// </summary>
+        /// <param name="d">the destination vertex</param>
+        internal void SetDest(Vertex d)
+        {
+            Sym.Orig = d;
+        }
+         */
+
+        /// <summary>
+        /// Gets or sets the vertex for the edge's origin
+        /// </summary>
+        /// <remarks>Gets the origin vertex</remarks>
+        public Vertex Orig { get; internal set; }
+
+        /// <summary>
+        /// Gets or sets the vertex for the edge's destination
+        /// </summary>
+        /// <remarks>Gets the destination vertex</remarks>
+        public Vertex Dest
+        {
+            get
+            {
+                return Sym.Orig;
+            }
+            internal set
+            {
+                Sym.Orig = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the length of the geometry of this quadedge.
+        /// </summary>
+        /// <remarks>Gets the length of the quadedge</remarks>
+        public double Length
+        {
+            get
+            {
+                return Orig.Coordinate.Distance(Dest.Coordinate);
+            }
+        }
+
+        /// <summary>
         /// Creates a new QuadEdge quartet from <see cref="Vertex"/>o to <see cref="Vertex"/> d.
         /// </summary>
         /// <param name="o">the origin Vertex</param>
@@ -113,21 +201,7 @@
             e.Dest = b.Dest;
         }
 
-        // the dual of this edge, directed from right to left
-        private Vertex _vertex; // The vertex that this edge represents
-        private QuadEdge _next; // A reference to a connected edge
-//    private int      visitedKey = 0;
-
         /// <summary>
-        /// Quadedges must be made using {@link makeEdge}, 
-        /// to ensure proper construction.
-        /// </summary>
-        private QuadEdge()
-        {
-
-        }
-
-        /// <summary>
         /// Gets the primary edge of this quadedge and its <tt>sym</tt>.
         /// The primary edge is the one for which the origin
         /// and destination coordinates are ordered
@@ -137,19 +211,13 @@
         public QuadEdge GetPrimary()
         {
             if (Orig.Coordinate.CompareTo(Dest.Coordinate) <= 0)
+            {
                 return this;
+            }
             return Sym;
         }
 
         /// <summary>
-        /// Gets or sets the external data value for this edge.
-        /// </summary>
-        /// <remarks>
-        /// an object containing external data
-        /// </remarks>
-        public object Data { set; get; }
-
-        /// <summary>
         /// Marks this quadedge as being deleted.
         /// This does not free the memory used by
         /// this quadedge quartet, but indicates
@@ -162,23 +230,71 @@
         }
 
         /// <summary>
-        /// Tests whether this edge has been deleted.
+        /// Sets the connected edge
         /// </summary>
-        /// <returns>true if this edge has not been deleted.</returns>
-        public bool IsLive
+        /// <param name="next">edge</param>
+        public void SetNext(QuadEdge next)
         {
-            get { return Rot != null; }
+            ONext = next;
         }
 
         /// <summary>
-        /// Sets the connected edge
+        /// Tests if this quadedge and another have the same line segment geometry, 
+        /// regardless of orientation.
         /// </summary>
-        /// <param name="next">edge</param>
-        public void SetNext(QuadEdge next)
+        /// <param name="qe">a quadege</param>
+        /// <returns>true if the quadedges are based on the same line segment regardless of orientation</returns>
+        public bool EqualsNonOriented(QuadEdge qe)
         {
-            _next = next;
+            if (EqualsOriented(qe))
+            {
+                return true;
+            }
+            if (EqualsOriented(qe.Sym))
+            {
+                return true;
+            }
+            return false;
         }
 
+        /// <summary>
+        /// Tests if this quadedge and another have the same line segment geometry
+        /// with the same orientation.
+        /// </summary>
+        /// <param name="qe">a quadege</param>
+        /// <returns>true if the quadedges are based on the same line segment</returns>
+        public bool EqualsOriented(QuadEdge qe)
+        {
+            if (Orig.Coordinate.Equals2D(qe.Orig.Coordinate)
+                && Dest.Coordinate.Equals2D(qe.Dest.Coordinate))
+            {
+                return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Creates a <see cref="LineSegment"/> representing the
+        /// geometry of this edge.
+        /// </summary>
+        /// <returns>a LineSegment</returns>
+        public LineSegment ToLineSegment()
+        {
+            return new LineSegment(Orig.Coordinate, Dest.Coordinate);
+        }
+
+        /// <summary>
+        /// Converts this edge to a WKT two-point <tt>LINESTRING</tt> indicating 
+        /// the geometry of this edge.
+        /// </summary>
+        /// <returns>a String representing this edge's geometry</returns>
+        public override String ToString()
+        {
+            var p0 = Orig.Coordinate;
+            var p1 = Dest.Coordinate;
+            return WKTWriter.ToLineString(p0, p1);
+        }
+
         /***************************************************************************
          * QuadEdge Algebra 
          ***************************************************************************
@@ -191,18 +307,6 @@
         internal QuadEdge Rot { get; set; }
 
         /// <summary>
-        /// Gets the dual of this edge, directed from its left to its right.
-        /// </summary>
-        /// <remarks>Gets the inverse rotated edge.</remarks>
-        private QuadEdge InvRot
-        {
-            get
-            {
-                return Rot.Sym;
-            }
-        }
-
-        /// <summary>
         /// Gets the edge from the destination to the origin of this edge.
         /// </summary>
         /// <remarks>Gets the sym of the edge.</remarks>
@@ -213,18 +317,12 @@
                 return Rot.Rot;
             }
         }
-        
+
         /// <summary>
         /// Gets the next CCW edge around the origin of this edge.
         /// </summary>
         /// <remarks>Gets the next linked edge.</remarks>
-        internal QuadEdge ONext
-        {
-            get
-            {
-                return _next;
-            }
-        }
+        internal QuadEdge ONext { get; private set; }
 
         /// <summary>
         /// Gets the next CW edge around (from) the origin of this edge.
@@ -234,23 +332,11 @@
         {
             get
             {
-                return Rot._next.Rot;
+                return Rot.ONext.Rot;
             }
         }
 
         /// <summary>
-        /// Gets the next CCW edge around (into) the destination of this edge.
-        /// </summary>
-        /// <remarks>Get the next destination edge.</remarks>
-        private QuadEdge DNext
-        {
-            get
-            {
-                return Sym.ONext.Sym;
-            }
-        }
-
-        /// <summary>
         /// Gets the next CW edge around (into) the destination of this edge.
         /// </summary>
         /// <remarks>Get the previous destination edge.</remarks>
@@ -270,7 +356,7 @@
         {
             get
             {
-                return this.InvRot.ONext.Rot;
+                return InvRot.ONext.Rot;
             }
         }
 
@@ -282,146 +368,56 @@
         {
             get
             {
-                return _next.Sym;
+                return ONext.Sym;
             }
         }
 
         /// <summary>
-        /// Gets the edge around the right face ccw following this edge.
+        /// Gets the dual of this edge, directed from its left to its right.
         /// </summary>
-        /// <remarks>Gets the next right face edge.</remarks>
-        private QuadEdge RNext
+        /// <remarks>Gets the inverse rotated edge.</remarks>
+        private QuadEdge InvRot
         {
             get
             {
-                return Rot._next.InvRot;
+                return Rot.Sym;
             }
         }
 
         /// <summary>
-        /// Gets the edge around the right face ccw before this edge.
+        /// Gets the next CCW edge around (into) the destination of this edge.
         /// </summary>
-        /// <remarks>Gets the previous right face edge.</remarks>
-        private QuadEdge RPrev
+        /// <remarks>Get the next destination edge.</remarks>
+        private QuadEdge DNext
         {
             get
             {
-                return this.Sym.ONext;
+                return Sym.ONext.Sym;
             }
         }
 
-        /***********************************************************************************************
-         * Data Access
-         **********************************************************************************************/
-        /*
         /// <summary>
-        /// Sets the vertex for this edge's origin
+        /// Gets the edge around the right face ccw following this edge.
         /// </summary>
-        /// <param name="o">the origin vertex</param>
-        internal void SetOrig(Vertex o)
+        /// <remarks>Gets the next right face edge.</remarks>
+        private QuadEdge RNext
         {
-            _vertex = o;
-        }
-         */
-
-        /*
-        /// <summary>
-        /// Sets the vertex for this edge's destination
-        /// </summary>
-        /// <param name="d">the destination vertex</param>
-        internal void SetDest(Vertex d)
-        {
-            Sym.Orig = d;
-        }
-         */
-
-        /// <summary>
-        /// Gets or sets the vertex for the edge's origin
-        /// </summary>
-        /// <remarks>Gets the origin vertex</remarks>
-        public Vertex Orig
-        {
-            get { return _vertex; }
-            internal set
+            get
             {
-                _vertex = value;
+                return Rot.ONext.InvRot;
             }
         }
 
         /// <summary>
-        /// Gets or sets the vertex for the edge's destination
+        /// Gets the edge around the right face ccw before this edge.
         /// </summary>
-        /// <remarks>Gets the destination vertex</remarks>
-        public Vertex Dest
+        /// <remarks>Gets the previous right face edge.</remarks>
+        private QuadEdge RPrev
         {
-            get { return Sym.Orig; }
-            internal set
-            {
-                Sym.Orig = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the length of the geometry of this quadedge.
-        /// </summary>
-        /// <remarks>Gets the length of the quadedge</remarks>
-        public double Length
-        {
             get
             {
-                return Orig.Coordinate.Distance(Dest.Coordinate);
+                return Sym.ONext;
             }
         }
-
-        /// <summary>
-        /// Tests if this quadedge and another have the same line segment geometry, 
-        /// regardless of orientation.
-        /// </summary>
-        /// <param name="qe">a quadege</param>
-        /// <returns>true if the quadedges are based on the same line segment regardless of orientation</returns>
-        public bool EqualsNonOriented(QuadEdge qe)
-        {
-            if (EqualsOriented(qe))
-                return true;
-            if (EqualsOriented(qe.Sym))
-                return true;
-            return false;
-        }
-
-        /// <summary>
-        /// Tests if this quadedge and another have the same line segment geometry
-        /// with the same orientation.
-        /// </summary>
-        /// <param name="qe">a quadege</param>
-        /// <returns>true if the quadedges are based on the same line segment</returns>
-        public bool EqualsOriented(QuadEdge qe)
-        {
-            if (Orig.Coordinate.Equals2D(qe.Orig.Coordinate)
-                && Dest.Coordinate.Equals2D(qe.Dest.Coordinate))
-                return true;
-            return false;
-        }
-
-        /// <summary>
-        /// Creates a <see cref="LineSegment"/> representing the
-        /// geometry of this edge.
-        /// </summary>
-        /// <returns>a LineSegment</returns>
-        public LineSegment ToLineSegment()
-        {
-            return new LineSegment(_vertex.Coordinate, Dest.Coordinate);
-        }
-
-        /// <summary>
-        /// Converts this edge to a WKT two-point <tt>LINESTRING</tt> indicating 
-        /// the geometry of this edge.
-        /// </summary>
-        /// <returns>a String representing this edge's geometry</returns>
-        public override String ToString()
-        {
-            var p0 = _vertex.Coordinate;
-            var p1 = Dest.Coordinate;
-            return WKTWriter.ToLineString(p0, p1);
-        }
     }
 }
\ No newline at end of file