refactor highlight