Refactor Operators module.