Refactoring performed