Adding sonar plugin and removing unnecessary variable