Fixing the sonar issues one after the other