cppcheck cleanups