Even more formatting tweaks

Wish I had a way to view this before committing.