modified Movie class, cleaning code