cleanup, add assignments 2 and 3