refs #770 - Refactor highlight code