Add trailing whitespace killer; structure editing