lab6 cleanup, lab7 file