595-19 fixed code violations

fixed code violations