HW2
Cleaned some code