reflect review comment refs #141