Trailing spaces cleanup