Edits from review comments