Cleaned up Movie class