reflect the review comments refs #122