- cleanup from cppcheck report