Cleanup and better overview slide.