adds a few small refactors