Cleanup whitespace.
Use structure instead of plain fd for socket object.