Final Refactorings