improve client handling
go fmt