Improve trailing whitespaces