Much simplified demonstration

Yes, this is much better (except for the "use tabs" conding convention ;] ).  I've taken the advice from the previous pull request and applied it.