gofmt and typo fix