consolidate a few regex