Refactoring in process