Refactoring next step