a few cleanups for the demo