Refactor for new highlighting method. Remove unused functions