Fixing sonar issues 4