#390 Mostly whitespace fixes