GherkinHighlighter code cleanup