Use more idiomatic style