Streamline demos

This should streamline the demo code to try to make it as minimal as possible.