Cleaning up example code a bit.