couple more refactors