Resolved sonar code violations