adapt comments from review