Cleanup and indentation fixes in client code.