Refactored MovieService.