cleaning up code analysis issues
cleaning up code analysis issues