regex consolidation