Fixed #2 during class review
HW Comments