Whitspace cleanup
Reorder imports
More whitespace changes
Merge pull request #7 from tempodb/client-cleanup

Client cleanup