Refactor Operators

Goal: shorten the code