refactor highlighted comment behaviour