Implementing review feedback, gofmt, go vet fixes