Revert some whitespace changes