Some cleanups of tutorial 3