More cleanup. Also, further unification of different tutorials.