fixed code analysis rulesets and violations
Merge pull request #676 from adamralph/code-analysis

fixed code analysis rulesets and violations