Made it more idiomatic