Minor refactoring
Improve Operator group highlighting