some cleanups according to sonar rules as thank u

I did not proceed with more cleanups, as I dont know ur code style, maybe u can include it with the sources make source donations as easy as possible ;)

Cheers Lars