Added deletion of trailing whitespace