Make go vet and golint happy