[nightshift] code-quality: automated improvements#1

Microck wants to merge 1 commit intomainMicrock/goofish-watcher:mainfrom

nightshift/code-qualityMicrock/goofish-watcher:nightshift/code-qualityCopy head branch name to clipboard