addressed code analysis warnings