Cleaning up example code a wee bit.

Geeze, I'm going to have to do a little cleanup and get some real tests written here...