Last refactoring