more minor refactors