client.go more efficient