Updated controllers and fixed SonarQube issues
Fixed Sonar issue.