Fix some linter issues

[mjtrangoni]

Hi @alexanderzobnin,

This PR fixes some trivial linter issues reported by golangci-lint. Maybe it would be worth adding it to the CI after fixing the remaining issues.

Let me know if you are interested and I can implement it.

[CLAassistant]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

[ivanahuckova]

Closing this PR as there are too many merge conflicts to resolve.