cppcheck cleanup
cppcheck cleanup