first steps in refactoring