fixed some cppcheck's gruntings