Code cleanup, fixing sonar violations