Refactored HttpConnection.cs

websocket-sharp/Net/HttpConnection.cs

@@ -395,19 +395,22 @@ namespace WebSocketSharp.Net
 
     private void removeConnection ()
     {
-      if (_lastListener == null)
+      if (_lastListener == null) {
         _listener.RemoveConnection (this);
-      else
+        return;
+      }
+
       _lastListener.RemoveConnection (this);
     }
 
     private void unbind ()
     {
-      if (_contextWasBound) {
+      if (!_contextWasBound)
+        return;
+
       _listener.UnbindContext (_context);
       _contextWasBound = false;
     }
-    }
 
     #endregion