a little tidy and some better commentary