k1w1dev

Fix sonar issues

1

## What problem does this PR solve? Fixes majority of the high severity issues raised by Sonar. There's a few more left but the changes are already big enough for...