Some basic cleanup in prep for lecture.