fix 'go vet' and 'golint' warnings