Cosmetic
CPU performance improvement, move string match away from RE module