Improved demo app
Cleaned up a bit.