- Removed unused comments
- Refactored websocket (forgot to do it before!).