More formatting fixes, do not highlight gherkin