Heavy refactoring task completed