Remove trailing whitespace
Add some comments to the client code
Reorder imports, add #!, mark executable