Refactoring in process.