[REFACTORING #15 step 5]