refactoring next step