Some whitespace updates