Mewan, Vinod | #2327 |

* Refactored and added a comparator
* Reset the usage to 0 when operator changes