Clean up arithmetic operators