Fix golangci-lint reported errors

[cruizen]

          Thanks for adding this! Can you fix the reported errors too?

Originally posted by @mithilarun in #155 (review)