Tidy up websocket starter

Fixes gh-396