preparing for refactoring
some more refactoring