cleanup + hw4