Refactor binary operatioions