Cleanup.

Just a few things that have been bugging me.