remove severity icon
fix some sonar warnings
Merge pull request #140 from just-boris/master

Remove severity icon
Merge pull request #141 from eroshenkoam/master

Refactoring