Miscellaneous and minor reformatting