Rep 539 - Fixed sonar violations for an onboarding task