idiomatic and other refactors from review