Cleaning up and adding expanding example for demo