fix golint issues