some more refactorings
some more refactorings