A bunch of additional formatting changes I think you'll like.