cleaning up refactoring side-effects