Heavy refactorings