Mostly whitespace changes