Refactored operators a bit.