Fix to strip out extra trailing spaces, and remove Let import