MovieModel Refactor