Incorporate comments from review