tidy after review
defer decision around re-raising

by using a better behaived example type