Fixing sonar issues 3