Cleanup based on clazy reports
I've checked sources with default clazy settings and decided that I'd like to get rid of some found warnings.
I've checked sources with default clazy settings and decided that I'd like to get rid of some found warnings.