Removed major sonar errors
Merge pull request #11 from Nickname53/ui

Removed major sonar errors