Performed the fourth code refactoring