- code cleanup from coverity scan