- cppcheck code cleanup