Refactored movie class.