Tweaked some of the formatting rules