Completed challenge and added my refactored solution.