More softabs and trailing spaces removal