Some whitespace cleanup