Fix golint issues