- cleanup code from cppcheck report