Minor refactoring of Movie class