Extracted all operators
Commit before refactoring