Clean up whitespace collapsing a bit