Tidy up and slight simplifications of the demo app