General cleanup and documentation added to demo