refactoring away from movies