tidied up with `go fmt`