Video upload and play back tidies up