step 7 (refactoring) done