Resolved some sonar issues: Peformance