Mini refactor of cell highlighting