Adapt to reviewer comments