remove some more trailing spaces and tabs