Clang-tidy complaints, so the if-else structure of the implementation of the...

Clang-tidy complaints, so the if-else structure of the implementation of the operators changed. The code is a little bit ugly so it should be evaluated