updated refactor challenge