go-vet

Fix go vet warnings