Cast and Crew: code cleanup