Last refactorings