Some cppcheck cleaning

Just some cppcheck cleaning