Some whitespace reformat