Refactoring processing