refactor: code quality cleanup pass#8

ADWilkinson wants to merge 1 commit intomainADWilkinson/oneshot-cli:mainfrom

cleanup/code-qualityADWilkinson/oneshot-cli:cleanup/code-qualityCopy head branch name to clipboard