next step to finish refactoring