Code style fixes, mostly whitespace