Reviewed Others Code and Refactored Mine

Completed Challenge 7 - Still need to do reflection