Miscellaneous formatting tweaks