Sonarcloud cleanups

[dshadowwolf]

...not a clue why this is so packed, but maybe I should have re-forked my local prior to starting the work...

[CLAassistant]

Thank you for your submission, we really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
2 out of 3 committers have signed the CLA.

:white_check_mark: dshadowwolf
:white_check_mark: jriwanek
:x: knoxhack
_{You have signed the CLA already but the status is still pending? Let us recheck it.}