address issues identified in #629 review.