Tweak some formatting stuff