Tidying up before demo