Code refactoring next step.