Fixup use of whitespace in places