Refactored, fixed binary operators