Miscellaneous formatting and indentation updates.