Tweak formatting, etc.