refactor movies