make things a little more idiomatic