Cleanup in  extract_data_number