Code cleanup before release and handout to teacher.