refactoring step 1

....