diff --git a/websocket-sharp/Ext.cs b/websocket-sharp/Ext.cs
index 09df2fa8..f3c62a00 100644
--- a/websocket-sharp/Ext.cs
+++ b/websocket-sharp/Ext.cs
@@ -510,9 +510,9 @@ namespace WebSocketSharp
     }
 
     internal static TcpListenerWebSocketContext GetWebSocketContext (
-      this TcpClient client, string protocol, X509Certificate cert, bool secure, Logger logger)
+      this TcpClient client, string protocol, bool secure, X509Certificate cert, Logger logger)
     {
-      return new TcpListenerWebSocketContext (client, protocol, cert, secure, logger);
+      return new TcpListenerWebSocketContext (client, protocol, secure, cert, logger);
     }
 
     internal static bool IsCompressionExtension (this string value)
diff --git a/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs b/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs
index 3f364e9f..6e06b499 100644
--- a/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs
+++ b/websocket-sharp/Net/WebSockets/TcpListenerWebSocketContext.cs
@@ -59,14 +59,12 @@ namespace WebSocketSharp.Net.WebSockets
     #region Internal Constructors
 
     internal TcpListenerWebSocketContext (
-      TcpClient client, string protocol, X509Certificate cert, bool secure, Logger logger)
+      TcpClient client, string protocol, bool secure, X509Certificate cert, Logger logger)
     {
       _client = client;
       _secure = secure;
-      _stream = WsStream.CreateServerStream (client, cert, secure);
-      _request = _stream.ReadHandshake<HandshakeRequest> (
-        HandshakeRequest.Parse, 90000);
-
+      _stream = WsStream.CreateServerStream (client, secure, cert);
+      _request = _stream.ReadHandshake<HandshakeRequest> (HandshakeRequest.Parse, 90000);
       _websocket = new WebSocket (this, protocol, logger);
     }
 
@@ -326,8 +324,8 @@ namespace WebSocketSharp.Net.WebSockets
       var host = _request.Headers ["Host"];
       var rawUri = _request.RequestUri;
       var path = rawUri.IsAbsoluteUri
-               ? rawUri.PathAndQuery
-               : HttpUtility.UrlDecode (_request.RawUrl);
+                 ? rawUri.PathAndQuery
+                 : HttpUtility.UrlDecode (_request.RawUrl);
 
       return String.Format ("{0}://{1}{2}", scheme, host, path).ToUri ();
     }
@@ -356,7 +354,7 @@ namespace WebSocketSharp.Net.WebSockets
     }
 
     internal void SetUser (
-      AuthenticationSchemes expectedScheme,
+      AuthenticationSchemes scheme,
       string realm,
       Func<IIdentity, NetworkCredential> credentialsFinder)
     {
@@ -364,29 +362,29 @@ namespace WebSocketSharp.Net.WebSockets
       if (authRes == null)
         return;
 
-      var identity = authRes.ToIdentity ();
-      if (identity == null)
+      var id = authRes.ToIdentity ();
+      if (id == null)
         return;
 
-      NetworkCredential credentials = null;
+      NetworkCredential cred = null;
       try {
-        credentials = credentialsFinder (identity);
+        cred = credentialsFinder (id);
       }
       catch {
       }
 
-      if (credentials == null)
+      if (cred == null)
         return;
 
-      var valid = expectedScheme == AuthenticationSchemes.Basic
-                ? ((HttpBasicIdentity) identity).Password == credentials.Password
-                : expectedScheme == AuthenticationSchemes.Digest
-                  ? ((HttpDigestIdentity) identity).IsValid (
-                      credentials.Password, realm, _request.HttpMethod, null)
-                  : false;
+      var valid = scheme == AuthenticationSchemes.Basic
+                  ? ((HttpBasicIdentity) id).Password == cred.Password
+                  : scheme == AuthenticationSchemes.Digest
+                    ? ((HttpDigestIdentity) id).IsValid (
+                        cred.Password, realm, _request.HttpMethod, null)
+                    : false;
 
       if (valid)
-        _user = new GenericPrincipal (identity, credentials.Roles);
+        _user = new GenericPrincipal (id, cred.Roles);
     }
 
     #endregion
diff --git a/websocket-sharp/Server/WebSocketServer.cs b/websocket-sharp/Server/WebSocketServer.cs
index c6996d77..ce433bf9 100644
--- a/websocket-sharp/Server/WebSocketServer.cs
+++ b/websocket-sharp/Server/WebSocketServer.cs
@@ -476,7 +476,7 @@ namespace WebSocketSharp.Server
       ThreadPool.QueueUserWorkItem (
         state => {
           try {
-            var context = client.GetWebSocketContext (null, _cert, _secure, _logger);
+            var context = client.GetWebSocketContext (null, _secure, _cert, _logger);
             if (_authSchemes != AuthenticationSchemes.Anonymous &&
                 !authenticateRequest (_authSchemes, context))
               return;
diff --git a/websocket-sharp/WsStream.cs b/websocket-sharp/WsStream.cs
index 1808c9f5..4007d7c6 100644
--- a/websocket-sharp/WsStream.cs
+++ b/websocket-sharp/WsStream.cs
@@ -163,7 +163,7 @@ namespace WebSocketSharp
     }
 
     internal static WsStream CreateServerStream (
-      TcpClient client, X509Certificate cert, bool secure)
+      TcpClient client, bool secure, X509Certificate cert)
     {
       var netStream = client.GetStream ();
       if (secure) {