Small cleanup of code, using "in" instead of "find" for strings when possible.