Refactoring of operators