highlight trailing spaces correctly, remove unused cruft