small refactors that were left behind