Reverted to using a pipe instead of a socket
Cosmetic corrections