Use a more idiomatic style