fix golint and vet warnings