Better extract_number