Tidy up the demo just a bit