assignment 1 finished! just need some code cleanup