addressed some sonar violations of unused code, loose coupling and parameter assignment