more cleanup, assignment 4