Refactoring : step 2