Format match-highlighter to follow conventions