Update from review comments