Minor formatting tweaks

I thought it would be quicker to tweak than to comment and have you do it.  These were my only minor comments/changes on the PR as it stands at present.