mostly trivial refactors