Miscellaneous clean-up/reformatting