fix minor golint issues