Cosmetic - fixes sonar issues