Final refactorings