modenized the code

[boazsade]

This code was written based on C++ 98, we would like to move as much of it into C++17/C++20