[REFACTORING #15 step 4]