SPWebSocketChannel: Code Cleanup part 3