Chg: Refactor Movies class.