making things more idiomatic