clean up the demo a bit