More formatting tweaks.  Most of this is adding {} to if statements.