Some whitespace fixing