Miscellaneous and minor formatting tweaks