perform some more small refactors