final clean up for hw6