refactored and answered
Finished group challenge