- refactored highlighting cells