Clean up whitespace collapsing