Refactoring: