added auto whitespace removal