static code analysis cleanups