Car show refactor