Fix go vet found error
Some linter fixes