More whitespace code-style fixes and neatenings