about to clean up actual data format