golint compliant and more idiomatic.