Some more tutorial cleanup