167 address code analysis violations

#167