Gofmt syntax fixes