getting ready for refactoring