Massive whitespace fixups