Refactor check_movie_record code some more