diff --git a/Version/RFC6455/Frame.php b/Version/RFC6455/Frame.php
index 21ad94d..126ad4c 100644
--- a/Version/RFC6455/Frame.php
+++ b/Version/RFC6455/Frame.php
@@ -3,11 +3,11 @@ namespace Ratchet\WebSocket\Version\RFC6455;
 use Ratchet\WebSocket\Version\FrameInterface;
 
 class Frame implements FrameInterface {
-    const OP_CONTINUE = 0;
-    const OP_TEXT     = 1;
-    const OP_BINARY   = 2;
-    const OP_CLOSE    = 8;
-    const OP_PING     = 9;
+    const OP_CONTINUE =  0;
+    const OP_TEXT     =  1;
+    const OP_BINARY   =  2;
+    const OP_CLOSE    =  8;
+    const OP_PING     =  9;
     const OP_PONG     = 10;
 
     const CLOSE_NORMAL      = 1000;
diff --git a/WsServer.php b/WsServer.php
index 6ee3e7a..dc388d1 100644
--- a/WsServer.php
+++ b/WsServer.php
@@ -8,7 +8,6 @@ use Guzzle\Http\Message\Response;
 /**
  * The adapter to handle WebSocket requests/responses
  * This is a mediator between the Server and your application to handle real-time messaging through a web browser
- * @todo Separate this class into a two classes: Component and a protocol handler
  * @link http://ca.php.net/manual/en/ref.http.php
  * @link http://dev.w3.org/html5/websockets/
  */
@@ -73,12 +72,6 @@ class WsServer implements MessageComponentInterface {
      * {@inheritdoc}
      */
     public function onOpen(ConnectionInterface $conn) {
-        //$wsConn = new WsConnection($conn);
-
-        //$this->connections->attach($conn, $wsConn);
-
-        //$this->reqParser->onOpen($wsConn);
-
         $conn->WebSocket = new \StdClass;
         $conn->WebSocket->established = false;
     }