Tidy up of code before demo