With all the corrections performed in the Code Review