Operator overloading wasn't needed there
Couple more changes (big surprise)