A little more final clean up