improve number matching using regex