The last cleanup changes I made before printing.