Whitespace on save improved