Improvement on cppcheck