Refactor challenge completed