cleanup and better demo