Tidying pre-demo