cppcheck cleanup