Working on refactor-steps.