Further cleanup in extract_data_number