Demo script tidying