Refactor Solo Challenge