Improve readability
Improve general readability of the code. I put here an example. The If-then-else with question mark. This syntax was inherited from previous versions of the code but, in my opinion, it ruins the readability. Not only this, but it can also be dangerous as reported here: https://stackoverflow.com/questions/31238104/c-macro-min-max-not-working-properly