Improved consistency of the code