#272 addressed code analysis violations

#272