I can replace it if you think it improves the readability. I made this change because i always try to have a **unique** `return` point on each of my functions:
* this way, it is easier to use a breakpoint of the exit of the function when debugging
* if we need it, we can easilly add some conditional instrumentation on the code (such as guard conditions in UML) using macros at the input and/or the ouput of a function.