Tidy up the plots and outputs