Miscellaneous whitespace changes