Can we simply move `upload_date` into its line(s)?