Refactor refactor refactor. Found a better way to represent the operators.