Next refactoring