diff --git a/websocket-sharp/Server/IWebSocketSession.cs b/websocket-sharp/Server/IWebSocketSession.cs
index 27ec3192..d86c19ef 100644
--- a/websocket-sharp/Server/IWebSocketSession.cs
+++ b/websocket-sharp/Server/IWebSocketSession.cs
@@ -32,19 +32,17 @@ using WebSocketSharp.Net.WebSockets;
 namespace WebSocketSharp.Server
 {
   /// <summary>
-  /// Exposes the properties used for accessing the information in a session in a WebSocket
-  /// service.
+  /// Exposes the properties used to access the information in a session in a WebSocket service.
   /// </summary>
   public interface IWebSocketSession
   {
     #region Properties
 
     /// <summary>
-    /// Gets the information in the WebSocket connection request.
+    /// Gets the information in the connection request to the WebSocket service.
     /// </summary>
     /// <value>
-    /// A <see cref="WebSocketContext"/> that provides the access to the WebSocket connection
-    /// request.
+    /// A <see cref="WebSocketContext"/> that provides the access to the connection request.
     /// </value>
     WebSocketContext Context { get; }
 
diff --git a/websocket-sharp/Server/WebSocketService.cs b/websocket-sharp/Server/WebSocketService.cs
index e905bce4..cb55a35b 100644
--- a/websocket-sharp/Server/WebSocketService.cs
+++ b/websocket-sharp/Server/WebSocketService.cs
@@ -34,7 +34,7 @@ using WebSocketSharp.Net.WebSockets;
 namespace WebSocketSharp.Server
 {
   /// <summary>
-  /// Exposes the methods and properties for a WebSocket service provided by the
+  /// Exposes a set of the methods and properties for a WebSocket service provided by the
   /// <see cref="HttpServer"/> or <see cref="WebSocketServer"/>.
   /// </summary>
   /// <remarks>
@@ -106,11 +106,10 @@ namespace WebSocketSharp.Server
     #region Public Properties
 
     /// <summary>
-    /// Gets the information in the WebSocket connection request.
+    /// Gets the information in the current connection request to the WebSocket service.
     /// </summary>
     /// <value>
-    /// A <see cref="WebSocketContext"/> that provides the access to the WebSocket connection
-    /// request.
+    /// A <see cref="WebSocketContext"/> that provides the access to the current connection request.
     /// </value>
     public WebSocketContext Context {
       get {