More idiomatic Go