More cosmetic cleanups
Even more cosmetic changes

I think I might have OCD...