Refactoring : step 1