Re: #122 - Cleaning up WebSocketClient code a little bit.