Clean up variable name search