-- first steps in refactoring