Refactoring Task_1.5