Fixed some sonar rules and called a source>cleanup on implementation