Removing socket code (see the socket branch) and cleaning up commas for consistency