'go vet' and 'golint' fixes