Refactor to remove movies averages