Update to be more idiomatic