Minor cosmetic cleanups (formatting mostly)