fix warning
refactoring: introduce Operator class