Miscellaneous reformatting and refactoring