Highlighter cleanup, more formatting.