Websocket Broadcast refactored and normalized