- minor cleanup -> more idiomatic