Refactoring step 1