Improve the quality of the code further "by cppcheck"