A little more clean up of demo code.