Cleans up the demo a little