Change strfind for findstr in previous commit + a little tidying up.