refactoring step 2
refactoring