small refactors...