Formatting Tweaks

Sorry to have this get messy, but I have some formatting tweaks I did at the last minute, since I didn't expect to get pulled. I'm going to (ugh) do my own code review and just fix all this, since I'm familiar with the system.