More tutorial cleanups