minor refactors
more refactors