go-lint compliant and more idiomatic