Refactor operators