Cppcheck cleanup