Cleaning up assignments 1 and 2