finish hw4 more cleanup