Jason's cleanup of tut2.py