[Movieselection] Some code cleanup.