Code Style Cleanup

[stevemcquaid]

Ran:
gofumpt -w -l on all files goimports -w -l on all files

Found this a ton of stuff with this: golangci-lint run --deadline=30m --disable-all --no-config --issues-exit-code=1 --enable=bodyclose --enable=deadcode --enable=dupl --enable=errcheck --enable=gocognit --enable=goconst --enable=gocyclo --enable=gofmt --enable=gofumpt --enable=goimports --enable=golint --enable=gomodguard --enable=gosec --enable=govet --enable=ineffassign --enable=interfacer --enable=megacheck --enable=misspell --enable=nakedret --enable=prealloc --enable=rowserrcheck --enable=staticcheck --enable=structcheck --enable=stylecheck --enable=typecheck --enable=unconvert --enable=unparam --enable=varcheck --enable=whitespace