small refactors
more refactoring