Improve number parsing