Slight tweak for a more idiomatic code