Video upload and playback tidy up