Addressing the issue in this PR.
1.) [DONE] golangci-lint run --fix to auto-fix errors 2.) fix manual errors* (in-progress)
golangci-lint run --fix
I don't fully trust auto-fix ... may have to test a new build before merge.
auto-fix