Improve Code Quality

[xmljim]

Sonarcube:

< 5 Reliability Issues (Major or Critical)
< 50 Major or Higher Code Smells
< 5d Technical Debt