Small cleanups 2

Mostly whitespace changes