Bunch of lint fixes in client.go