Run gofmt again
Improve parts of script and client handling