moved event listening throgh util so all listeners could be removed when needed. Refactored highlighter