refactoring
fix code analysis violations