Last refactoring.