Eliminate findstring in more places