make all the things more idiomatic