Tidying the demo