gofmt, minor changes