Trim down SocketMixin and make style changes per request