gofmt fixes