Refactor VideoService.