Further edits from review comments