-Sonar fixes
Merge branch 'master' of https://github.com/agrechko/SE459_Final