Improve string comparison