Straightened up demo code.