A little more idiomatic