assignment 6 cleanup