Refactor the highlighter classes to make them completely trivial