Improved regex for numeric values