Fix demo

Somehow the demo got broken... this makes it work ;)

Also got rid of some unnecessary boilerplate in the ViewController.