Additional edits from review comments