Restructured variables, simplified organize_data()