Working on refactoring steps.