Fix golint warnings