General cleanup of everything I can see right now.

I swear I'm done... for now at least.