Efficiency and quote updates
Merge pull request #946 from darkwing/demo-cleanup

Efficiency and quote updates