Refactoring in process...