fix some sonar issues
Merge pull request #1 from baev/origin

Fix some sonar issues