Some Go style suggestions for client.go and client_test.go

A few minor Go style suggestions which include (possibly incorrect) comments on exported functions; moving some code into the if conditional and in-lining one expression.