Refactored some stuff in assignment1.assignment1.
Refactored some stuff in assignment1.assignment1.