Clearer (more idiomatic?) to use when here