tut4: More cleanup, updated pic, too