Making some final clean ups.

Addressing some of the final issues Jason brought up.