Day 7 Final Pt. 2

Cleaned up the code