no more TODO
vet and fmt