refactor-challenge-solution