Formatting cleanups from `go fmt`