Compliant with golint and more idiomatic.