more go-lint fixes