go-lint style fixes