lab 2 done, need cleanup