Simplifying the demo app