[c2475] Improve readability of the code and avoid visual studio warning c4996, I don't think this can cause problems with gcc (z2431)