diff --git a/websocket-sharp/Net/WebSockets/HttpListenerWebSocketContext.cs b/websocket-sharp/Net/WebSockets/HttpListenerWebSocketContext.cs
index 9af18c6c..a6e7d01e 100644
--- a/websocket-sharp/Net/WebSockets/HttpListenerWebSocketContext.cs
+++ b/websocket-sharp/Net/WebSockets/HttpListenerWebSocketContext.cs
@@ -34,7 +34,7 @@ using System.Security.Principal;
 namespace WebSocketSharp.Net.WebSockets
 {
   /// <summary>
-  /// Provides the properties used for accessing the information in a WebSocket connection request
+  /// Provides the properties used to access the information in a WebSocket connection request
   /// received by the <see cref="HttpListener"/>.
   /// </summary>
   /// <remarks>
@@ -44,8 +44,8 @@ namespace WebSocketSharp.Net.WebSockets
     #region Private Fields
 
     private HttpListenerContext _context;
-    private WebSocket           _websocket;
     private WsStream            _stream;
+    private WebSocket           _websocket;
 
     #endregion
 
@@ -227,8 +227,9 @@ namespace WebSocketSharp.Net.WebSockets
     /// This property represents the subprotocols requested by the client.
     /// </remarks>
     /// <value>
-    /// An IEnumerable&lt;string&gt; instance that provides an enumerator which supports the
-    /// iteration over the values of the Sec-WebSocket-Protocol header.
+    /// An <see cref="T:System.Collections.Generic.IEnumerable{string}"/> instance that provides
+    /// an enumerator which supports the iteration over the values of the Sec-WebSocket-Protocol
+    /// header.
     /// </value>
     public override IEnumerable<string> SecWebSocketProtocols {
       get {
diff --git a/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs b/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs
index 5658bd60..44b60cb2 100644
--- a/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs
+++ b/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs
@@ -36,7 +36,7 @@ using System.Security.Principal;
 namespace WebSocketSharp.Net.WebSockets
 {
   /// <summary>
-  /// Provides the properties used for accessing the information in a WebSocket connection request
+  /// Provides the properties used to access the information in a WebSocket connection request
   /// received by the <see cref="TcpListener"/>.
   /// </summary>
   /// <remarks>
@@ -45,8 +45,8 @@ namespace WebSocketSharp.Net.WebSockets
   {
     #region Private Fields
 
-    private CookieCollection _cookies;
     private TcpClient        _client;
+    private CookieCollection _cookies;
     private HandshakeRequest _request;
     private bool             _secure;
     private WsStream         _stream;
@@ -239,8 +239,9 @@ namespace WebSocketSharp.Net.WebSockets
     /// This property represents the subprotocols requested by the client.
     /// </remarks>
     /// <value>
-    /// An IEnumerable&lt;string&gt; instance that provides an enumerator which supports the
-    /// iteration over the values of the Sec-WebSocket-Protocol header.
+    /// An <see cref="T:System.Collections.Generic.IEnumerable{string}"/> instance that provides
+    /// an enumerator which supports the iteration over the values of the Sec-WebSocket-Protocol
+    /// header.
     /// </value>
     public override IEnumerable<string> SecWebSocketProtocols {
       get {
diff --git a/websocket-sharp/Net/WebSockets/WebSocketContext.cs b/websocket-sharp/Net/WebSockets/WebSocketContext.cs
index 028ce2e6..78930148 100644
--- a/websocket-sharp/Net/WebSockets/WebSocketContext.cs
+++ b/websocket-sharp/Net/WebSockets/WebSocketContext.cs
@@ -34,7 +34,7 @@ using System.Security.Principal;
 namespace WebSocketSharp.Net.WebSockets
 {
   /// <summary>
-  /// Exposes the properties used for accessing the information in a WebSocket connection request.
+  /// Exposes the properties used to access the information in a WebSocket connection request.
   /// </summary>
   /// <remarks>
   /// The WebSocketContext class is an abstract class.
@@ -161,8 +161,9 @@ namespace WebSocketSharp.Net.WebSockets
     /// This property represents the subprotocols requested by the client.
     /// </remarks>
     /// <value>
-    /// An IEnumerable&lt;string&gt; instance that provides an enumerator which supports the
-    /// iteration over the values of the Sec-WebSocket-Protocol header.
+    /// An <see cref="T:System.Collections.Generic.IEnumerable{string}"/> instance that provides
+    /// an enumerator which supports the iteration over the values of the Sec-WebSocket-Protocol
+    /// header.
     /// </value>
     public abstract IEnumerable<string> SecWebSocketProtocols { get; }