tidied up the demo a bit