Tidy up Socket
[FOLD] SocketWrapper tidying
[FOLD] More SocketWrapper tidy