Cleaning up
flame_data is now organized